Catch process.CmdError instead of error.CmdError

Now we using process module from avocado to run commands
and raise exceptiones, so adapt tp-libvirt cases to it.

Signed-off-by: Yanbing Du <ydu@redhat.com>

Author: will-Do

libguestfs/tests/virt_sysprep.py

@@ -4,7 +4,8 @@
 import aexpect
 
 from autotest.client.shared import error
-from autotest.client import utils
+
+from avocado.utils import process
 
 from virttest import libvirt_vm
 from virttest import virsh
@@ -80,7 +81,7 @@ def modify_source(vm_name, target, dst_image):
             virsh.attach_disk(vm_name, dst_image, target, extra=options,
                               ignore_status=False)
         except (remote.LoginError, virt_vm.VMError,
-                aexpect.ShellError, error.CmdError), detail:
+                aexpect.ShellError, process.CmdError), detail:
             raise error.TestFail("Modify guest source failed: %s" % detail)
 
     def modify_network(vm_name, first_nic):
@@ -141,7 +142,7 @@ def clean_clone_vm():
                 virsh.undefine(vm_clone_name, ignore_status=False)
             if os.path.exists(clone_image):
                 os.remove(clone_image)
-        except error.CmdError, detail:
+        except process.CmdError, detail:
             raise error.TestFail("Clean clone guest failed!:%s" % detail)
 
     sysprep_type = params.get("sysprep_type", 'clone')
@@ -193,8 +194,8 @@ def clean_clone_vm():
         if sysprep_type == "resize":
             img_size = image_info_dict['vsize'] / 1024 / 1024 / 1024
             resize_image = "%s_resize.img" % clone_image
-            utils.run("qemu-img create -f raw %s %dG" % (resize_image,
-                                                         (img_size + 1)))
+            cmd = "qemu-img create -f raw %s %dG" % (resize_image, (img_size + 1))
+            process.run(cmd, shell=True)
             lgf.virt_resize_cmd(clone_image, resize_image, timeout=600,
                                 debug=True)
             modify_source(vm_clone_name, target, resize_image)

libvirt/tests/src/libvirt_bench/libvirt_bench_usb_hotplug.py

@@ -4,6 +4,8 @@
 
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import data_dir
 from virttest import virsh
 from virttest import utils_test
@@ -91,28 +93,28 @@ def _is_stress_running():
 
                         result = virsh.qemu_monitor_command(vm_name, attach_cmd, options=options)
                         if result.exit_status:
-                            raise error.CmdError(result.command, result)
+                            raise process.CmdError(result.command, result)
                     if keyboard:
                         attach_cmd = "device_add"
                         attach_cmd += " usb-kdb,bus=usb1.0,id=kdb"
 
                         result = virsh.qemu_monitor_command(vm_name, attach_cmd, options=options)
                         if result.exit_status:
-                            raise error.CmdError(result.command, result)
+                            raise process.CmdError(result.command, result)
                     if mouse:
                         attach_cmd = "device_add"
                         attach_cmd += " usb-mouse,bus=usb1.0,id=mouse"
 
                         result = virsh.qemu_monitor_command(vm_name, attach_cmd, options=options)
                         if result.exit_status:
-                            raise error.CmdError(result.command, result)
+                            raise process.CmdError(result.command, result)
                     if tablet:
                         attach_cmd = "device_add"
                         attach_cmd += " usb-tablet,bus=usb1.0,id=tablet"
 
                         result = virsh.qemu_monitor_command(vm_name, attach_cmd, options=options)
                         if result.exit_status:
-                            raise error.CmdError(result.command, result)
+                            raise process.CmdError(result.command, result)
                 else:
                     if disk:
                         utils_test.libvirt.create_local_disk("file", path, size="1M")
@@ -128,7 +130,7 @@ def _is_stress_running():
 
                         result = virsh.attach_device(vm_name, disk_xml.xml)
                         if result.exit_status:
-                            raise error.CmdError(result.command, result)
+                            raise process.CmdError(result.command, result)
                     if mouse:
                         mouse_xml = Input("mouse")
                         mouse_xml.input_bus = "usb"
@@ -137,7 +139,7 @@ def _is_stress_running():
 
                         result = virsh.attach_device(vm_name, mouse_xml.xml)
                         if result.exit_status:
-                            raise error.CmdError(result.command, result)
+                            raise process.CmdError(result.command, result)
                     if tablet:
                         tablet_xml = Input("tablet")
                         tablet_xml.input_bus = "usb"
@@ -146,7 +148,7 @@ def _is_stress_running():
 
                         result = virsh.attach_device(vm_name, tablet_xml.xml)
                         if result.exit_status:
-                            raise error.CmdError(result.command, result)
+                            raise process.CmdError(result.command, result)
                     if keyboard:
                         kbd_xml = Input("keyboard")
                         kbd_xml.input_bus = "usb"
@@ -155,7 +157,7 @@ def _is_stress_running():
 
                         result = virsh.attach_device(vm_name, kbd_xml.xml)
                         if result.exit_status:
-                            raise error.CmdError(result.command, result)
+                            raise process.CmdError(result.command, result)
 
                 if attach_type == "qemu_monitor":
                     options = "--hmp"
@@ -165,46 +167,46 @@ def _is_stress_running():
 
                         result = virsh.qemu_monitor_command(vm_name, attach_cmd, options=options)
                         if result.exit_status:
-                            raise error.CmdError(result.command, result)
+                            raise process.CmdError(result.command, result)
                     if mouse:
                         attach_cmd = "device_del"
                         attach_cmd += (" mouse")
 
                         result = virsh.qemu_monitor_command(vm_name, attach_cmd, options=options)
                         if result.exit_status:
-                            raise error.CmdError(result.command, result)
+                            raise process.CmdError(result.command, result)
                     if keyboard:
                         attach_cmd = "device_del"
                         attach_cmd += (" keyboard")
 
                         result = virsh.qemu_monitor_command(vm_name, attach_cmd, options=options)
                         if result.exit_status:
-                            raise error.CmdError(result.command, result)
+                            raise process.CmdError(result.command, result)
                     if tablet:
                         attach_cmd = "device_del"
                         attach_cmd += (" tablet")
 
                         result = virsh.qemu_monitor_command(vm_name, attach_cmd, options=options)
                         if result.exit_status:
-                            raise error.CmdError(result.command, result)
+                            raise process.CmdError(result.command, result)
                 else:
                     if disk:
                         result = virsh.detach_device(vm_name, disk_xml.xml)
                         if result.exit_status:
-                            raise error.CmdError(result.command, result)
+                            raise process.CmdError(result.command, result)
                     if mouse:
                         result = virsh.detach_device(vm_name, mouse_xml.xml)
                         if result.exit_status:
-                            raise error.CmdError(result.command, result)
+                            raise process.CmdError(result.command, result)
                     if keyboard:
                         result = virsh.detach_device(vm_name, kbd_xml.xml)
                         if result.exit_status:
-                            raise error.CmdError(result.command, result)
+                            raise process.CmdError(result.command, result)
                     if tablet:
                         result = virsh.detach_device(vm_name, tablet_xml.xml)
                         if result.exit_status:
-                            raise error.CmdError(result.command, result)
-        except error.CmdError, e:
+                            raise process.CmdError(result.command, result)
+        except process.CmdError, e:
             if not status_error:
                 raise error.TestFail("failed to attach device.\n"
                                      "Detail: %s." % result)

libvirt/tests/src/libvirt_scsi.py

@@ -7,6 +7,8 @@
 
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import virt_vm
 from virttest import qemu_storage
 from virttest import data_dir
@@ -77,7 +79,7 @@ def run(test, params, env):
         try:
             cdrom = CdromDisk(cdrom_path, data_dir.get_tmp_dir())
             cdrom.close()
-        except error.CmdError, detail:
+        except process.CmdError, detail:
             raise error.TestNAError("Failed to create cdrom disk: %s" % detail)
 
         cdrom_disk = Disk(type_name="file")

libvirt/tests/src/libvirt_usb_hotplug_device.py

@@ -6,6 +6,8 @@
 
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import data_dir
 from virttest import virsh
 from virttest import utils_misc
@@ -91,7 +93,7 @@ def is_hotplug_ok():
 
                     result = virsh.qemu_monitor_command(vm_name, attach_cmd, options=opt)
                     if result.exit_status or (result.stdout.find("OK") == -1):
-                        raise error.CmdError(result.command, result)
+                        raise process.CmdError(result.command, result)
 
                     attach_cmd = "device_add usb-storage,"
                     attach_cmd += ("id=drive-usb-%s,bus=usb1.0,drive=drive-usb-%s" % (i, i))
@@ -101,7 +103,7 @@ def is_hotplug_ok():
 
                 result = virsh.qemu_monitor_command(vm_name, attach_cmd, options=opt)
                 if result.exit_status:
-                    raise error.CmdError(result.command, result)
+                    raise process.CmdError(result.command, result)
             else:
                 attributes = {'type_name': "usb", 'bus': "1", 'port': "0"}
                 if usb_type == "storage":
@@ -124,7 +126,7 @@ def is_hotplug_ok():
 
                 result = virsh.attach_device(vm_name, dev_xml.xml)
                 if result.exit_status:
-                    raise error.CmdError(result.command, result)
+                    raise process.CmdError(result.command, result)
 
         if status_error and usb_type == "storage":
             if utils_misc.wait_for(is_hotplug_ok, timeout=30):
@@ -148,12 +150,12 @@ def is_hotplug_ok():
 
                 result = virsh.qemu_monitor_command(vm_name, attach_cmd, options=opt)
                 if result.exit_status:
-                    raise error.CmdError(result.command, result)
+                    raise process.CmdError(result.command, result)
             else:
                 result = virsh.detach_device(vm_name, dev_xml.xml)
                 if result.exit_status:
-                    raise error.CmdError(result.command, result)
-    except error.CmdError, e:
+                    raise process.CmdError(result.command, result)
+    except process.CmdError, e:
         if not status_error:
             # live attach of device 'input' is not supported
             ret = result.stderr.find("Operation not supported")

libvirt/tests/src/macvtap.py

@@ -4,6 +4,8 @@
 
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import remote
 from virttest import utils_net
 from virttest import virsh
@@ -52,7 +54,7 @@ def run(test, params, env):
         origin_status = iface_cls.is_up()
         if not origin_status:
             iface_cls.up()
-    except error.CmdError, detail:
+    except process.CmdError, detail:
         raise error.TestNAError(str(detail))
     br_cls = utils_net.Bridge()
     if eth_card_no in br_cls.list_iface():
@@ -154,7 +156,7 @@ def private_test(session):
                                  % (vm1.name, vm2.name))
         try:
             iface_cls.down()
-        except error.CmdError, detail:
+        except process.CmdError, detail:
             raise error.TestNAError(str(detail))
         ping_s, _ = ping(vm2_ip, count=1, timeout=5, session=session)
         if not ping_s:
@@ -199,7 +201,7 @@ def bridge_test(session):
                                  % (vm1.name, vm2.name))
         try:
             iface_cls.down()
-        except error.CmdError, detail:
+        except process.CmdError, detail:
             raise error.TestNAError(str(detail))
         ping_s, _ = ping(remote_ip, count=1, timeout=5, session=session)
         if not ping_s:

libvirt/tests/src/multifunction.py

@@ -4,6 +4,8 @@
 
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import libvirt_vm
 from virttest import virsh
 from virttest import data_dir
@@ -33,7 +35,7 @@ def cleanup_vm(vm_name=None, disk_removed=None):
     try:
         if vm_name is not None:
             virsh.undefine(vm_name)
-    except error.CmdError:
+    except process.CmdError:
         pass
     try:
         if disk_removed is not None:

libvirt/tests/src/numa/guest_numa.py

@@ -1,9 +1,10 @@
 import re
 import logging
 
-from autotest.client.shared import utils
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import virt_vm
 from virttest import libvirt_xml
 from virttest import utils_misc
@@ -359,6 +360,6 @@ def _update_qemu_conf():
             libvirtd.restart()
             for mt_path in mount_path:
                 try:
-                    utils.system("umount %s" % mt_path)
-                except error.CmdError:
+                    process.run("umount %s" % mt_path, shell=True)
+                except process.CmdError:
                     logging.warning("umount %s failed" % mt_path)

libvirt/tests/src/storage_discard.py

@@ -6,9 +6,11 @@
 import logging
 import time
 
-from autotest.client import utils, lv_utils
+from autotest.client import lv_utils
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import virsh
 from virttest import data_dir
 from virttest import iscsi
@@ -35,7 +37,7 @@ def get_disk_capacity(disk_type, imagefile=None, lvname=None):
                     while for block, it's volume space percentage in 'lvs'
     """
     if disk_type == "file":
-        result = utils.run("du -sm %s" % imagefile)
+        result = process.run("du -sm %s" % imagefile, shell=True)
         return result.stdout.split()[0].strip()
     elif disk_type == "block":
         if lvname is None:
@@ -64,7 +66,7 @@ def create_iscsi_device(device_size="2G"):
     if iscsi_device == ():
         raise error.TestFail("No matched iscsi device.")
 
-    check_ret = utils.run("ls %s" % device_name)
+    check_ret = process.run("ls %s" % device_name, shell=True)
     if check_ret.exit_status:
         raise error.TestFail("Can not find provided device:%s" % check_ret)
     return device_name
@@ -208,7 +210,7 @@ def do_fstrim(fstrim_type, vm, status_error=False):
                % vm.name)
         try:
             virsh.command(cmd, debug=True, ignore_status=False)
-        except error.CmdError:
+        except process.CmdError:
             raise error.TestFail("Execute qemu-agent-command failed.")
 
 
@@ -323,6 +325,7 @@ def run(test, params, env):
                 lv_utils.vg_remove("vgthin")
             except error.TestError, detail:
                 logging.debug(str(detail))
-            utils.run("pvremove -f %s" % discard_device, ignore_status=True)
+            process.run("pvremove -f %s" % discard_device, ignore_status=True,
+                        shell=True)
             if create_iscsi:
                 utlv.setup_or_cleanup_iscsi(is_setup=False)

libvirt/tests/src/svirt/dac_nfs_disk.py

@@ -3,7 +3,8 @@
 import logging
 
 from autotest.client.shared import error
-from autotest.client import utils
+
+from avocado.utils import process
 
 from virttest import qemu_storage
 from virttest import data_dir
@@ -131,7 +132,8 @@ def run(test, params, env):
                      export_options=export_options)
 
         # set virt_use_nfs
-        result = utils.run("setsebool virt_use_nfs %s" % virt_use_nfs)
+        result = process.run("setsebool virt_use_nfs %s" % virt_use_nfs,
+                             shell=True)
         if result.exit_status:
             raise error.TestNAError("Failed to set virt_use_nfs value")
 
@@ -213,7 +215,7 @@ def run(test, params, env):
         try:
             virsh.detach_disk(vm_name, target="vdf", extra="--persistent",
                               debug=True)
-        except error.CmdError:
+        except process.CmdError:
             raise error.TestFail("Detach disk 'vdf' from VM %s failed."
                                  % vm.name)
     finally:

libvirt/tests/src/svirt/svirt_attach_disk.py

@@ -1,7 +1,8 @@
 import logging
 
 from autotest.client.shared import error
-from autotest.client import utils
+
+from avocado.utils import process
 
 from virttest import qemu_storage
 from virttest import data_dir
@@ -130,7 +131,8 @@ def run(test, params, env):
             # set host_sestatus as nfs pool will reset it
             utils_selinux.set_status(host_sestatus)
             # set virt_use_nfs
-            result = utils.run("setsebool virt_use_nfs %s" % virt_use_nfs)
+            result = process.run("setsebool virt_use_nfs %s" % virt_use_nfs,
+                                 shell=True)
             if result.exit_status:
                 raise error.TestNAError("Failed to set virt_use_nfs value")
         else:
@@ -195,7 +197,7 @@ def run(test, params, env):
         try:
             virsh.detach_disk(vm_name, target="vdf", extra="--persistent",
                               debug=True)
-        except error.CmdError:
+        except process.CmdError:
             raise error.TestFail("Detach disk 'vdf' from VM %s failed."
                                  % vm.name)
     finally:

libvirt/tests/src/timer_management.py

@@ -9,6 +9,8 @@
 from autotest.client import utils
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import utils_test
 from virttest import virsh
 from virttest import data_dir
@@ -253,7 +255,7 @@ def manipulate_vm(vm, operation, params=None):
             try:
                 inject_times -= 1
                 virsh.inject_nmi(vm.name, debug=True, ignore_status=False)
-            except error.CmdError, detail:
+            except process.CmdError, detail:
                 err_msg = "Inject nmi failed: %s" % detail
     elif operation == "dump":
         dump_times = int(params.get("dump_times", 10))
@@ -263,7 +265,7 @@ def manipulate_vm(vm, operation, params=None):
             dump_path = os.path.join(data_dir.get_tmp_dir(), "dump.file")
             try:
                 virsh.dump(vm.name, dump_path, debug=True, ignore_status=False)
-            except (error.CmdError, OSError), detail:
+            except (process.CmdError, OSError), detail:
                 err_msg = "Dump %s failed: %s" % (vm.name, detail)
             try:
                 os.remove(dump_path)
@@ -277,7 +279,7 @@ def manipulate_vm(vm, operation, params=None):
             try:
                 virsh.suspend(vm.name, debug=True, ignore_status=False)
                 virsh.resume(vm.name, debug=True, ignore_status=False)
-            except error.CmdError, detail:
+            except process.CmdError, detail:
                 err_msg = "Suspend-Resume %s failed: %s" % (vm.name, detail)
     elif operation == "save_restore":
         save_times = int(params.get("save_times", 10))
@@ -289,7 +291,7 @@ def manipulate_vm(vm, operation, params=None):
                 virsh.save(vm.name, save_path, debug=True,
                            ignore_status=False)
                 virsh.restore(save_path, debug=True, ignore_status=False)
-            except error.CmdError, detail:
+            except process.CmdError, detail:
                 err_msg = "Save-Restore %s failed: %s" % (vm.name, detail)
             try:
                 os.remove(save_path)

libvirt/tests/src/vfio.py

@@ -4,6 +4,8 @@
 
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import libvirt_vm
 from virttest import virsh
 from virttest import data_dir
@@ -187,7 +189,7 @@ def execute_ttcp(vm, params):
     # Check connection first
     try:
         session1.cmd("ping -c 4 %s" % remote_ip)
-    except error.CmdError:
+    except Exception:
         raise error.TestFail("Couldn't connect to %s through %s"
                              % (remote_ip, vm.name))
 
@@ -247,7 +249,7 @@ def cleanup_vm(vm_name=None):
     try:
         if vm_name is not None:
             virsh.undefine(vm_name)
-    except error.CmdError:
+    except process.CmdError:
         pass
 
 
@@ -292,7 +294,7 @@ def test_nic_group(vm, params):
                                 ignore_status=False)
         logging.debug("VMXML with disk boot:\n%s", virsh.dumpxml(vm.name))
         vm.start()
-    except (error.CmdError, virt_vm.VMStartError), detail:
+    except (process.CmdError, virt_vm.VMStartError), detail:
         cleanup_devices(pci_id, device_type)
         raise error.TestFail("New device does not work well: %s" % detail)
 
@@ -368,7 +370,7 @@ def test_fibre_group(vm, params):
                                 ignore_status=False)
         logging.debug("VMXML with disk boot:\n%s", virsh.dumpxml(vm.name))
         vm.start()
-    except (error.CmdError, virt_vm.VMStartError), detail:
+    except (process.CmdError, virt_vm.VMStartError), detail:
         cleanup_devices(pci_id, device_type)
         raise error.TestFail("New device does not work well: %s" % detail)
 
@@ -437,7 +439,7 @@ def test_win_fibre_group(vm, params):
                             flagstr="--config", debug=True,
                             ignore_status=False)
         vm.start()
-    except (error.CmdError, virt_vm.VMStartError), detail:
+    except (process.CmdError, virt_vm.VMStartError), detail:
         cleanup_devices(pci_id, device_type)
         raise error.TestFail("New device does not work well: %s" % detail)
 
@@ -506,7 +508,7 @@ def test_nic_fibre_group(vm, params):
                             flagstr="--config", debug=True,
                             ignore_status=False)
         vm.start()
-    except (error.CmdError, virt_vm.VMStartError), detail:
+    except (process.CmdError, virt_vm.VMStartError), detail:
         cleanup_devices(nic_pci_id, "Ethernet")
         cleanup_devices(fibre_pci_id, "Fibre")
         raise error.TestFail("New device does not work well: %s" % detail)
@@ -596,7 +598,7 @@ def test_nic_single(vm, params):
         cleanup_devices(pci_id, device_type)
         raise error.TestFail("Start vm succesfully after attaching single "
                              "device to iommu group.Not expected.")
-    except (error.CmdError, virt_vm.VMStartError), detail:
+    except (process.CmdError, virt_vm.VMStartError), detail:
         logging.debug("Expected:New device does not work well: %s" % detail)
 
     # Reattaching all devices in iommu group

libvirt/tests/src/virsh_cmd/domain/virsh_destroy.py

@@ -1,6 +1,8 @@
 from autotest.client.shared import error
 from autotest.client.shared import ssh_key
 
+from avocado.utils import process
+
 from virttest import libvirt_vm
 from virttest import remote
 from virttest import virsh
@@ -83,7 +85,7 @@ def run(test, params, env):
             status, output = session.cmd_status_output(command,
                                                        internal_timeout=5)
             session.close()
-        except error.CmdError:
+        except process.CmdError:
             status = 1
 
     if libvirtd == "off":

libvirt/tests/src/virsh_cmd/domain/virsh_domid.py

@@ -1,5 +1,7 @@
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import libvirt_vm
 from virttest import remote
 from virttest import virsh
@@ -55,7 +57,7 @@ def remote_test(params, vm_name):
             if status != 0:
                 err = output
             session.close()
-        except error.CmdError:
+        except process.CmdError:
             status = 1
             output = ""
             err = "remote test failed"

libvirt/tests/src/virsh_cmd/domain/virsh_migrate_multi_vms.py

@@ -5,6 +5,8 @@
 from autotest.client.shared import error
 from autotest.client.shared import ssh_key
 
+from avocado.utils import process
+
 from virttest import libvirt_vm
 from virttest import virsh
 from virttest import remote
@@ -126,8 +128,8 @@ def thread_func_migration(virsh_instance, cmd):
     global ret_migration
     # Migrate the domain.
     try:
-        result = virsh_instance.command(cmd, ignore_status=False)
-    except error.CmdError, detail:
+        virsh_instance.command(cmd, ignore_status=False)
+    except process.CmdError, detail:
         logging.error("Migration with %s failed:\n%s" % (cmd, detail))
         ret_migration = False
 

libvirt/tests/src/virsh_cmd/domain/virsh_migrate_virtio_scsi.py

@@ -4,9 +4,10 @@
 import time
 
 from autotest.client.shared import error
-from autotest.client.shared import utils
 from autotest.client.shared import ssh_key
 
+from avocado.utils import process
+
 from virttest import utils_test
 from virttest import virsh
 from virttest import utils_misc
@@ -27,7 +28,7 @@ def check_vm_state(vm, state):
         """
         try:
             actual_state = vm.state()
-        except error.CmdError:
+        except process.CmdError:
             return False
         if cmp(actual_state, state) == 0:
             return True
@@ -47,7 +48,7 @@ def check_disks_in_vm(vm, vm_ip, disks_list=[], runner=None):
                 try:
                     logging.debug(runner.run(check_cmd))
                     continue
-                except error.CmdError, detail:
+                except process.CmdError, detail:
                     logging.debug("Remote checking failed:%s", detail)
                     fail_list.append(disk)
             else:
@@ -65,12 +66,12 @@ def get_disk_id(device):
         """
         Show disk by id.
         """
-        output = utils.run("ls /dev/disk/by-id/").stdout
+        output = process.run("ls /dev/disk/by-id/", shell=True).stdout
         for line in output.splitlines():
             disk_ids = line.split()
             for disk_id in disk_ids:
-                disk = os.path.basename(utils.run("readlink %s"
-                                                  % disk_id).stdout)
+                disk = os.path.basename(
+                    process.run("readlink %s" % disk_id, shell=True).stdout)
                 if disk == os.path.basename(device):
                     return disk_id
         return None
@@ -240,7 +241,7 @@ def start_check_vm(vm):
                                                     params, config=attach_disk_config)
                 if ret.exit_status:
                     raise error.TestFail(ret)
-        except (error.TestFail, error.CmdError), detail:
+        except (error.TestFail, process.CmdError), detail:
             if status_error:
                 logging.debug("Expected failure:%s", detail)
                 return
@@ -309,4 +310,4 @@ def start_check_vm(vm):
 
         if runner:
             runner.session.close()
-        utils.run("rm -f %s/*vsmtest" % created_img_path)
+        process.run("rm -f %s/*vsmtest" % created_img_path, shell=True)

libvirt/tests/src/virsh_cmd/domain/virsh_qemu_monitor_blockjob.py

@@ -5,6 +5,8 @@
 from autotest.client.shared import error
 from autotest.client.shared import ssh_key
 
+from avocado.utils import process
+
 from virttest import utils_test
 from virttest import libvirt_vm
 from virttest import virsh
@@ -88,7 +90,7 @@ def copied_migration(vm, params, blockjob_type=None, block_target="vda"):
         elif blockjob_type == "complete":
             virsh.qemu_monitor_command(vm.name, complete_cmd, debug=True,
                                        ignore_status=False)
-    except error.CmdError, detail:
+    except process.CmdError, detail:
         blockjob_failures.append(str(detail))
 
     # Job info FYI

libvirt/tests/src/virsh_cmd/domain/virsh_reboot.py

@@ -5,6 +5,8 @@
 
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import libvirt_vm
 from virttest import virt_vm
 from virttest import virsh
@@ -80,7 +82,7 @@ def run(test, params, env):
                 status, output = session.cmd_status_output(command,
                                                            internal_timeout=5)
                 session.close()
-            except (remote.LoginError, error.CmdError, aexpect.ShellError), e:
+            except (remote.LoginError, process.CmdError, aexpect.ShellError), e:
                 logging.error("Exception: %s", str(e))
                 status = -1
         if vm_ref != "remote_name":

libvirt/tests/src/virsh_cmd/domain/virsh_setvcpus.py

@@ -5,6 +5,8 @@
 
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import remote
 from virttest import virsh
 from virttest import libvirt_vm
@@ -33,7 +35,7 @@ def remote_test(remote_ip, local_ip, remote_pwd, remote_prompt,
         session.close()
         if status != 0:
             err = output
-    except error.CmdError:
+    except process.CmdError:
         status = 1
         err = "remote test failed"
     return status, status_error, err

libvirt/tests/src/virsh_cmd/domain/virsh_shutdown.py

@@ -1,5 +1,7 @@
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import remote
 from virttest import libvirt_vm
 from virttest import virsh
@@ -88,7 +90,7 @@ def run(test, params, env):
                            % (remote_uri, vm_name, mode))
                 status = session.cmd_status(command, internal_timeout=5)
                 session.close()
-            except error.CmdError:
+            except process.CmdError:
                 status = 1
 
         # recover libvirtd service start

libvirt/tests/src/virsh_cmd/domain/virsh_undefine.py

@@ -4,7 +4,8 @@
 import aexpect
 
 from autotest.client.shared import error
-from autotest.client import utils
+
+from avocado.utils import process
 
 from virttest import libvirt_vm
 from virttest import virsh
@@ -154,7 +155,7 @@ def run(test, params, env):
                 cmd_undefine = "virsh -c %s undefine %s" % (uri, vm_name)
                 status, output = session.cmd_status_output(cmd_undefine)
                 logging.info("Undefine output: %s", output)
-            except (error.CmdError, remote.LoginError, aexpect.ShellError), de:
+            except (process.CmdError, remote.LoginError, aexpect.ShellError), de:
                 logging.error("Detail: %s", de)
                 status = 1
 
@@ -167,7 +168,7 @@ def run(test, params, env):
             try:
                 if vm.is_alive():
                     vm.destroy(gracefully=False)
-            except error.CmdError, detail:
+            except process.CmdError, detail:
                 logging.error("Detail: %s", detail)
 
         # Check if VM exists.
@@ -197,7 +198,7 @@ def run(test, params, env):
             if virsh.domain_exists(vm.name):
                 virsh.undefine(vm_ref, ignore_status=True)
             cmd = "chmod 666 %s" % backup_xml.xml
-            utils.run(cmd, ignore_status=False)
+            process.run(cmd, ignore_status=False, shell=True)
             s_define = virsh.define(backup_xml.xml,
                                     unprivileged_user=unprivileged_user,
                                     uri=uri, ignore_status=True, debug=True)

libvirt/tests/src/virsh_cmd/domain/virsh_vcpuinfo.py

@@ -2,6 +2,8 @@
 
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import virsh
 from virttest import utils_libvirtd
 
@@ -62,7 +64,7 @@ def remote_case(params, vm_name):
             vcback.close_session()
             if status != 0:
                 err = output
-        except error.CmdError:
+        except process.CmdError:
             status = 1
             output = ""
             err = "remote test failed"

libvirt/tests/src/virsh_cmd/domain/virsh_vncdisplay.py

@@ -1,5 +1,7 @@
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import libvirt_vm
 from virttest import virsh
 from virttest import remote
@@ -59,7 +61,7 @@ def remote_case(params, vm_name):
             status, output = session.cmd_status_output(command,
                                                        internal_timeout=5)
             session.close()
-        except error.CmdError:
+        except process.CmdError:
             status = 1
             output = "remote test failed"
         return status, output

libvirt/tests/src/virsh_cmd/host/virsh_capabilities.py

@@ -2,10 +2,10 @@
 import re
 
 from autotest.client import os_dep
-from autotest.client.shared import utils
 from autotest.client.shared import error
 
 from avocado.utils import path as utils_path
+from avocado.utils import process
 
 from virttest import libvirt_vm
 from virttest import virsh
@@ -34,7 +34,7 @@ def compare_capabilities_xml(source):
         # Check the host arch.
         xml_arch = cap_xml.arch
         logging.debug("Host arch (capabilities_xml): %s", xml_arch)
-        exp_arch = utils.run("arch", ignore_status=True).stdout.strip()
+        exp_arch = process.run("arch", shell=True).stdout.strip()
         if cmp(xml_arch, exp_arch) != 0:
             raise error.TestFail("The host arch in capabilities_xml is expected"
                                  " to be %s, but get %s" % (exp_arch, xml_arch))
@@ -43,7 +43,7 @@ def compare_capabilities_xml(source):
         xml_cpu_count = cap_xml.cpu_count
         logging.debug("Host cpus count (capabilities_xml): %s", xml_cpu_count)
         cmd = "grep processor /proc/cpuinfo | wc -l"
-        exp_cpu_count = int(utils.run(cmd, ignore_status=True).stdout.strip())
+        exp_cpu_count = int(process.run(cmd, shell=True).stdout.strip())
         if xml_cpu_count != exp_cpu_count:
             raise error.TestFail("Host cpus count is expected to be %s, but get "
                                  "%s" % (exp_cpu_count, xml_cpu_count))
@@ -55,11 +55,11 @@ def compare_capabilities_xml(source):
             img = utils_path.find_command("qemu-kvm")
         except utils_path.CmdNotFoundError:
             raise error.TestNAError("Cannot find qemu-kvm")
-        if re.search("ppc", utils.run("arch").stdout):
+        if re.search("ppc", process.run("arch", shell=True).stdout):
             cmd = img + " --cpu ? | grep ppc"
         else:
             cmd = img + " --cpu ? | grep qemu"
-        cmd_result = utils.run(cmd, ignore_status=True)
+        cmd_result = process.run(cmd, shell=True)
         for guest in cap_xml.xmltreefile.findall('guest'):
             guest_wordsize = guest.find('arch').find('wordsize').text
             logging.debug("Arch of guest supported (capabilities_xml):%s",
@@ -73,7 +73,7 @@ def compare_capabilities_xml(source):
         first_domain = first_guest.find('arch').findall('domain')[0]
         guest_domain_type = first_domain.get('type')
         logging.debug("Hypervisor (capabilities_xml):%s", guest_domain_type)
-        cmd_result = utils.run("virsh uri", ignore_status=True)
+        cmd_result = process.run("virsh uri", shell=True)
         if not re.search(guest_domain_type, cmd_result.stdout.strip()):
             raise error.TestFail("The capabilities_xml gives an different "
                                  "hypervisor")
@@ -88,7 +88,7 @@ def compare_capabilities_xml(source):
             exp_pms = []
             for opt in pm_cap_map:
                 cmd = '%s --%s' % (pm_cmd, opt)
-                res = utils.run(cmd, ignore_status=True)
+                res = process.run(cmd, ignore_status=True, shell=True)
                 if res.exit_status == 0:
                     exp_pms.append(pm_cap_map[opt])
             pms = cap_xml.power_management_list
@@ -114,7 +114,7 @@ def compare_capabilities_xml(source):
         output = virsh.capabilities(option, uri=connect_uri,
                                     ignore_status=False, debug=True)
         status = 0  # good
-    except error.CmdError:
+    except process.CmdError:
         status = 1  # bad
         output = ''
 

libvirt/tests/src/virsh_cmd/host/virsh_uri.py

@@ -2,6 +2,8 @@
 
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import libvirt_vm
 from virttest import virsh
 from virttest import utils_libvirtd
@@ -48,7 +50,7 @@ def run(test, params, env):
                                        ignore_status=False,
                                        debug=True)
         status = 0  # good
-    except error.CmdError:
+    except process.CmdError:
         status = 1  # bad
         uri_test = ''
 

libvirt/tests/src/virsh_cmd/interface/virsh_iface_edit.py

@@ -4,9 +4,10 @@
 
 import aexpect
 
-from autotest.client import utils
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import remote
 from virttest import utils_net
 from virttest import virsh
@@ -23,7 +24,7 @@ def get_ifstart_mode(iface_name):
     try:
         xml = virsh.iface_dumpxml(iface_name, "--inactive", "", debug=True)
         start_mode = re.findall("start mode='(\S+)'", xml)[0]
-    except (error.CmdError, IndexError):
+    except (process.CmdError, IndexError):
         logging.error("Fail to get start mode for interface %s", iface_name)
     return start_mode
 
@@ -72,15 +73,15 @@ def run(test, params, env):
         new_ifstart_mode = "onboot"
     try:
         # Backup interface script
-        utils.run("cp %s %s" % (iface_script, iface_script_bk))
+        process.run("cp %s %s" % (iface_script, iface_script_bk), shell=True)
 
         # Edit interface
         edit_ifstart_mode(iface_name, old_ifstart_mode, new_ifstart_mode)
 
         # Restart interface
         if iface_is_up:
             net_iface.down()
-        utils.run("ifup %s" % iface_name)
+        process.run("ifup %s" % iface_name, shell=True)
 
         after_edit_mode = get_ifstart_mode(iface_name)
         if not after_edit_mode:
@@ -92,6 +93,6 @@ def run(test, params, env):
                                  % after_edit_mode)
     finally:
         net_iface.down()
-        utils.run("mv %s %s" % (iface_script_bk, iface_script))
+        process.run("mv %s %s" % (iface_script_bk, iface_script), shell=True)
         if iface_is_up:
-            utils.run("ifup %s" % iface_name)
+            process.run("ifup %s" % iface_name, shell=True)

libvirt/tests/src/virsh_cmd/monitor/virsh_domblkinfo.py

@@ -2,6 +2,8 @@
 
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import virsh
 from virttest.libvirt_xml import vm_xml
 
@@ -46,7 +48,7 @@ def attach_disk_test():
                 output_target = "Xen doesn't support domblkinfo target!"
             virsh.detach_disk(vm_name, front_dev, debug=True)
             return status_target, output_target, status_source, output_source
-        except (error.CmdError, IOError):
+        except (process.CmdError, IOError):
             return 1, "", 1, ""
 
     def check_disk_info():

libvirt/tests/src/virsh_cmd/monitor/virsh_dominfo.py

@@ -1,5 +1,7 @@
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import libvirt_vm
 from virttest import remote
 from virttest import virsh
@@ -55,7 +57,7 @@ def remote_test(params, vm_name):
             if status != 0:
                 err = output
             session.close()
-        except error.CmdError:
+        except process.CmdError:
             status = 1
             output = ""
             err = "remote test failed"

libvirt/tests/src/virsh_cmd/monitor/virsh_dommemstat.py

@@ -1,5 +1,7 @@
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import libvirt_vm
 from virttest import virsh
 from virttest import remote
@@ -65,7 +67,7 @@ def run(test, params, env):
                                                         extra)
             status = session.cmd_status(command, internal_timeout=5)
             session.close()
-        except error.CmdError:
+        except process.CmdError:
             status = 1
 
     # recover libvirtd service start

libvirt/tests/src/virsh_cmd/monitor/virsh_domstate.py

@@ -7,7 +7,8 @@
 from aexpect import ShellProcessTerminatedError
 
 from autotest.client.shared import error
-from autotest.client.shared import utils
+
+from avocado.utils import process
 
 from virttest import libvirt_vm
 from virttest import remote
@@ -54,7 +55,7 @@ def check_crash_state(cmd_output, crash_action, dump_file=""):
     if cmd_output.strip() == expect_output:
         crash_state = True
     if dump_file:
-        result = utils.run("ls %s" % dump_file, ignore_status=True)
+        result = process.run("ls %s" % dump_file, ignore_status=True, shell=True)
         if result.exit_status == 0:
             logging.debug("Find the auto dump core file:\n%s", result.stdout)
             find_dump_file = True
@@ -102,7 +103,7 @@ def run(test, params, env):
     backup_xml = vmxml.copy()
 
     # Back up qemu.conf
-    utils.run("cp %s %s" % (QEMU_CONF, QEMU_CONF_BK))
+    process.run("cp %s %s" % (QEMU_CONF, QEMU_CONF_BK), shell=True)
 
     dump_path = os.path.join(test.tmpdir, "dump/")
     dump_file = ""
@@ -121,7 +122,7 @@ def run(test, params, env):
             # Config auto_dump_path in qemu.conf
             cmd = "echo auto_dump_path = \\\"%s\\\" >> %s" % (dump_path,
                                                               QEMU_CONF)
-            utils.run(cmd)
+            process.run(cmd, shell=True)
             libvirtd_service.restart()
             if vm_oncrash_action in ['coredump-destroy', 'coredump-restart']:
                 dump_file = dump_path + vm_name + "-*"
@@ -168,7 +169,7 @@ def run(test, params, env):
                 except (ShellTimeoutError, ShellProcessTerminatedError):
                     pass
                 session.close()
-        except error.CmdError, e:
+        except process.CmdError, e:
             raise error.TestError("Guest prepare action error: %s" % e)
 
         if libvirtd == "off":
@@ -190,7 +191,7 @@ def run(test, params, env):
                 status, output = session.cmd_status_output(command,
                                                            internal_timeout=5)
                 session.close()
-            except error.CmdError:
+            except process.CmdError:
                 status = 1
         else:
             result = virsh.domstate(vm_ref, extra, ignore_status=True,
@@ -237,7 +238,7 @@ def run(test, params, env):
         if libvirtd == "off":
             utils_libvirtd.libvirtd_start()
         # Recover VM
-        utils.run("mv -f %s %s" % (QEMU_CONF_BK, QEMU_CONF))
+        process.run("mv -f %s %s" % (QEMU_CONF_BK, QEMU_CONF), shell=True)
         vm.destroy(gracefully=False)
         backup_xml.sync()
         if os.path.exists(dump_path):

libvirt/tests/src/virsh_cmd/monitor/virsh_domstats.py

@@ -57,7 +57,7 @@ def prepare_vm_state(vm, vm_state):
             except (ShellTimeoutError, ShellProcessTerminatedError):
                 pass
             session.close()
-        except error.CmdError, e:
+        except Exception, e:
             logging.error("Crash domain failed: %s", e)
     else:
         logging.error("Unknown state for this test")

libvirt/tests/src/virsh_cmd/network/virsh_net_destroy.py

@@ -2,6 +2,8 @@
 
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import virsh
 
 from provider import libvirt_version
@@ -59,7 +61,7 @@ def run(test, params, env):
         else:
             if network_status == "inactive":
                 virsh.net_destroy(network_name)
-    except error.CmdError:
+    except process.CmdError:
         raise error.TestError("Prepare network status failed!")
 
     status = virsh.net_destroy(net_ref, extra, uri=uri, debug=True,
@@ -78,7 +80,7 @@ def run(test, params, env):
         if (network_current_status == "inactive" and
                 virsh.net_state_dict()[network_name]['active']):
             virsh.net_destroy(network_name)
-    except error.CmdError:
+    except process.CmdError:
         raise error.TestError("Recover network status failed!")
 
     # Check status_error

libvirt/tests/src/virsh_cmd/network/virsh_net_list.py

@@ -3,6 +3,8 @@
 
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import virsh
 
 from provider import libvirt_version
@@ -54,21 +56,21 @@ def run(test, params, env):
                 virsh.net_destroy(net_name, ignore_status=False)
             virsh.net_undefine(net_name, ignore_status=False)
             virsh.net_create(tmp_xml, ignore_status=False)
-    except error.CmdError:
+    except process.CmdError:
         raise error.TestFail("Transient network test failed!")
 
     # Prepare network's status for testing.
     if net_status == "active":
         try:
             if not virsh.net_state_dict()[net_name]['active']:
                 virsh.net_start(net_name, ignore_status=False)
-        except error.CmdError:
+        except process.CmdError:
             raise error.TestFail("Active network test failed!")
     else:
         try:
             if virsh.net_state_dict()[net_name]['active']:
                 virsh.net_destroy(net_name, ignore_status=False)
-        except error.CmdError:
+        except process.CmdError:
             raise error.TestFail("Inactive network test failed!")
 
     virsh_dargs = {'ignore_status': True}
@@ -93,7 +95,7 @@ def run(test, params, env):
                 virsh.net_start(net_name, ignore_status=False)
             elif net_current_status == "inactive" and net_status == "active":
                 virsh.net_destroy(net_name, ignore_status=False)
-    except error.CmdError:
+    except process.CmdError:
         raise error.TestFail("Recover network failed!")
 
     # check result

libvirt/tests/src/virsh_cmd/snapshot/virsh_snapshot.py

@@ -3,6 +3,8 @@
 
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import virt_vm
 from virttest import virsh
 
@@ -23,7 +25,7 @@ def remove_snapshots(vm):
         for snap in snaps:
             try:
                 virsh.snapshot_delete(vm, snap)
-            except error.CmdError:
+            except process.CmdError:
                 logging.debug("Can not remove snapshot %s.", snap)
                 remove_failed = remove_failed + 1
 
@@ -136,7 +138,7 @@ def check_info(i1, i2, errorstr="Values differ"):
             check_info(infos["Descendants"], sni["Descendants"],
                        "Incorrect descendants count")
 
-        except error.CmdError:
+        except process.CmdError:
             handle_error("Failed getting snapshots info", vm_name)
         except error.TestFail, e:
             handle_error(str(e), vm_name)
@@ -163,7 +165,7 @@ def check_info(i1, i2, errorstr="Values differ"):
             session = vm.wait_for_login()
             test_file(session, sni["to_create"], 0)
             test_file(session, sni["to_delete"], 2)
-        except error.CmdError:
+        except process.CmdError:
             handle_error("Failed to revert snapshot", vm_name)
         except (error.TestFail, virt_vm.VMDeadError), e:
             handle_error(str(e), vm_name)

libvirt/tests/src/virsh_cmd/volume/virsh_vol_create.py

@@ -1,9 +1,10 @@
 import os
 import logging
 
-from autotest.client import utils
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import virsh
 from virttest import libvirt_storage
 from virttest import libvirt_xml
@@ -147,7 +148,7 @@ def post_process_vol(ori_vol_path):
         else:
             logging.error(unsupport_err)
             return
-        rst = utils.run(process_vol_cmd, ignore_status=True)
+        rst = process.run(process_vol_cmd, ignore_status=True, shell=True)
         if rst.exit_status:
             if "Snapshots of snapshots are not supported" in rst.stderr:
                 logging.debug("%s is already a snapshot volume", ori_vol_path)
@@ -218,7 +219,8 @@ def check_vol(pool_name, vol_name, expect_exist=True):
                 newvol = volxml.new_vol(**vol_arg)
                 vol_xml = newvol['xml']
                 if params.get('setup_libvirt_polkit') == 'yes':
-                    utils.run("chmod 666 %s" % vol_xml, ignore_status=True)
+                    process.run("chmod 666 %s" % vol_xml, ignore_status=True,
+                                shell=True)
 
                 # Run virsh_vol_create to create vol
                 logging.debug("Create volume from XML: %s" % newvol.xmltreefile)
@@ -257,7 +259,7 @@ def check_vol(pool_name, vol_name, expect_exist=True):
                 try:
                     virsh.pool_refresh(src_pool_name, ignore_status=False)
                     check_vol(src_pool_name, process_vol, expect_vol_exist)
-                except (error.CmdError, error.TestFail), e:
+                except (process.CmdError, error.TestFail), e:
                     if process_vol_type == "thin":
                         logging.error(e)
                         raise error.TestNAError("You may encounter bug BZ#1060287")
@@ -272,7 +274,7 @@ def check_vol(pool_name, vol_name, expect_exist=True):
         # lv snapshot, so before destroy the pool, we need activate it manually
         if src_pool_type == 'logical' and vol_path_list:
             vg_name = vol_path_list[0].split('/')[2]
-            utils.run("lvchange -ay %s" % vg_name)
+            process.run("lvchange -ay %s" % vg_name, shell=True)
         try:
             pvt.cleanup_pool(src_pool_name, src_pool_type, src_pool_target,
                              src_emulated_image)

libvirt/tests/src/virsh_cmd/volume/virsh_volume_application.py

@@ -3,6 +3,8 @@
 
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import libvirt_storage
 from virttest import virsh
 from virttest import data_dir
@@ -130,7 +132,7 @@ def run(test, params, env):
                 utils_selinux.set_status("permissive")
                 try:
                     unattended_install.run(test, params, env)
-                except error.CmdError, detail:
+                except process.CmdError, detail:
                     raise error.TestFail("Guest install failed:%s" % detail)
             finally:
                 if selinux_mode is not None:

libvirt/tests/src/virt_cmd/virt_xml_validate.py

@@ -5,6 +5,8 @@
 from autotest.client import os_dep, utils
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import virsh
 from virttest import data_dir
 from virttest.utils_test import libvirt
@@ -25,7 +27,7 @@ def check_info(s1, s2, errorstr="Values differ"):
         ss_info = virsh.snapshot_info(vm_name, snapshot_name)
         check_info(ss_info["Name"], snapshot_name, "Incorrect snapshot name")
         check_info(ss_info["Domain"], vm_name, "Incorrect domain name")
-    except error.CmdError, e:
+    except process.CmdError, e:
         error.TestFail(str(e))
     except error.TestFail, e:
         error.TestFail(str(e))
@@ -70,7 +72,7 @@ def storagepool_validate(pool_name, file=None, **virsh_dargs):
 
     try:
         virsh.pool_dumpxml(pool_name, to_file=file)
-    except error.CmdError, e:
+    except process.CmdError, e:
         error.TestFail(str(e))
 
 
@@ -156,7 +158,7 @@ def secret_validate(file=None, **virsh_dargs):
     if uuid:
         try:
             virsh.secret_dumpxml(uuid, to_file=file, **virsh_dargs)
-        except error.CmdError, e:
+        except process.CmdError, e:
             raise error.TestError(str(e))
 
 
@@ -177,7 +179,7 @@ def interface_validate(file=None, **virsh_dargs):
 
     try:
         virsh.iface_dumpxml(iface_name, to_file=file, **virsh_dargs)
-    except error.CmdError, e:
+    except process.CmdError, e:
         raise error.TestError(str(e))
 
 

libvirt/tests/src/virtual_disks/at_dt_iscsi_disk.py

@@ -7,6 +7,8 @@
 
 from autotest.client.shared import error
 
+from avocado.utils import process
+
 from virttest import virsh
 from virttest.remote import LoginError
 from virttest.virt_vm import VMError
@@ -195,12 +197,12 @@ def run(test, params, env):
 
             try:
                 virsh.snapshot_list(vm_name, **virsh_dargs)
-            except error.CmdError:
+            except process.CmdError:
                 error.TestFail("Failed getting snapshots list for %s", vm_name)
 
             try:
                 virsh.snapshot_info(vm_name, snapshot_name1, **virsh_dargs)
-            except error.CmdError:
+            except process.CmdError:
                 error.TestFail("Failed getting snapshots info for %s", vm_name)
 
             cmd_result = virsh.snapshot_dumpxml(vm_name, snapshot_name1,