[libvirt] [test-API PATCH 2/5] test-API: Remove the codes used to construct utils object
Osier Yang
jyang at redhat.com
Tue Apr 10 07:34:31 UTC 2012
$ for i in $(find . -type f -name "*.py"); do \
sed -i -e '/util *= *utils\.Utils()/d' $i; \
done
---
repos/domain/attach_disk.py | 1 -
repos/domain/attach_interface.py | 1 -
repos/domain/autostart.py | 1 -
repos/domain/balloon_memory.py | 1 -
repos/domain/blkstats.py | 1 -
repos/domain/console_mutex.py | 1 -
repos/domain/cpu_affinity.py | 1 -
repos/domain/cpu_topology.py | 1 -
repos/domain/create.py | 1 -
repos/domain/define.py | 1 -
repos/domain/destroy.py | 1 -
repos/domain/detach_disk.py | 1 -
repos/domain/detach_interface.py | 1 -
repos/domain/domain_blkinfo.py | 1 -
repos/domain/domain_id.py | 1 -
repos/domain/domain_uuid.py | 1 -
repos/domain/domblkinfo.py | 1 -
repos/domain/dump.py | 2 --
repos/domain/eventhandler.py | 1 -
repos/domain/ifstats.py | 1 -
repos/domain/install_image.py | 1 -
repos/domain/install_linux_cdrom.py | 2 --
repos/domain/install_linux_check.py | 1 -
repos/domain/install_linux_net.py | 2 --
repos/domain/install_windows_cdrom.py | 2 --
repos/domain/migrate.py | 1 -
repos/domain/ownership_test.py | 2 --
repos/domain/reboot.py | 1 -
repos/domain/restore.py | 1 -
repos/domain/resume.py | 1 -
repos/domain/save.py | 1 -
repos/domain/sched_params.py | 1 -
repos/domain/shutdown.py | 1 -
repos/domain/start.py | 1 -
repos/domain/suspend.py | 1 -
repos/domain/undefine.py | 1 -
repos/domain/update_devflag.py | 1 -
repos/interface/create.py | 1 -
repos/interface/define.py | 1 -
repos/interface/destroy.py | 1 -
repos/interface/undefine.py | 1 -
repos/libvirtd/qemu_hang.py | 2 --
repos/libvirtd/restart.py | 1 -
repos/libvirtd/upstart.py | 2 --
repos/network/autostart.py | 1 -
repos/network/create.py | 1 -
repos/network/define.py | 1 -
repos/network/destroy.py | 1 -
repos/network/network_list.py | 1 -
repos/network/network_name.py | 1 -
repos/network/network_uuid.py | 1 -
repos/network/start.py | 1 -
repos/network/undefine.py | 1 -
repos/nodedevice/detach.py | 1 -
repos/nodedevice/reattach.py | 1 -
repos/nodedevice/reset.py | 1 -
repos/npiv/create_virtual_hba.py | 1 -
.../multiple_thread_block_on_domain_create.py | 1 -
repos/remoteAccess/tcp_setup.py | 2 --
repos/remoteAccess/tls_setup.py | 2 --
repos/remoteAccess/unix_perm_sasl.py | 1 -
repos/sVirt/domain_nfs_start.py | 2 --
repos/snapshot/delete.py | 1 -
repos/snapshot/file_flag.py | 2 --
repos/snapshot/flag_check.py | 1 -
repos/snapshot/internal_create.py | 1 -
repos/snapshot/revert.py | 1 -
repos/storage/activate_pool.py | 1 -
repos/storage/build_dir_pool.py | 1 -
repos/storage/build_disk_pool.py | 1 -
repos/storage/build_logical_pool.py | 1 -
repos/storage/build_netfs_pool.py | 1 -
repos/storage/create_dir_pool.py | 1 -
repos/storage/create_dir_volume.py | 1 -
repos/storage/create_fs_pool.py | 1 -
repos/storage/create_iscsi_pool.py | 1 -
repos/storage/create_logical_volume.py | 1 -
repos/storage/create_netfs_pool.py | 1 -
repos/storage/create_netfs_volume.py | 1 -
repos/storage/create_partition_volume.py | 1 -
repos/storage/define_dir_pool.py | 1 -
repos/storage/define_disk_pool.py | 1 -
repos/storage/define_iscsi_pool.py | 1 -
repos/storage/define_logical_pool.py | 1 -
repos/storage/define_mpath_pool.py | 1 -
repos/storage/define_netfs_pool.py | 1 -
repos/storage/define_scsi_pool.py | 1 -
repos/storage/delete_dir_volume.py | 1 -
repos/storage/delete_logical_pool.py | 1 -
repos/storage/delete_logical_volume.py | 1 -
repos/storage/delete_netfs_volume.py | 1 -
repos/storage/delete_partition_volume.py | 1 -
repos/storage/destroy_pool.py | 1 -
repos/storage/pool_name.py | 1 -
repos/storage/pool_uuid.py | 1 -
repos/storage/undefine_pool.py | 1 -
96 files changed, 0 insertions(+), 107 deletions(-)
diff --git a/repos/domain/attach_disk.py b/repos/domain/attach_disk.py
index 7e0f94c..ad0d174 100644
--- a/repos/domain/attach_disk.py
+++ b/repos/domain/attach_disk.py
@@ -68,7 +68,6 @@ def attach_disk(params):
test_result = False
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/domain/attach_interface.py b/repos/domain/attach_interface.py
index f5c8c26..9ef3f8a 100644
--- a/repos/domain/attach_interface.py
+++ b/repos/domain/attach_interface.py
@@ -52,7 +52,6 @@ def attach_interface(params):
test_result = False
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/domain/autostart.py b/repos/domain/autostart.py
index bdb85b9..ca65886 100644
--- a/repos/domain/autostart.py
+++ b/repos/domain/autostart.py
@@ -66,7 +66,6 @@ def autostart(params):
return 1
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/domain/balloon_memory.py b/repos/domain/balloon_memory.py
index dea516b..fea997d 100644
--- a/repos/domain/balloon_memory.py
+++ b/repos/domain/balloon_memory.py
@@ -161,7 +161,6 @@ def balloon_memory(params):
# Connect to local hypervisor connection URI
global util
- util = utils.Utils()
uri = params['uri']
logger.info("get the mac address of vm %s" % domname)
diff --git a/repos/domain/blkstats.py b/repos/domain/blkstats.py
index be587b4..1ab7db6 100644
--- a/repos/domain/blkstats.py
+++ b/repos/domain/blkstats.py
@@ -45,7 +45,6 @@ def blkstats(params):
test_result = False
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/domain/console_mutex.py b/repos/domain/console_mutex.py
index 9ace047..edf46c1 100644
--- a/repos/domain/console_mutex.py
+++ b/repos/domain/console_mutex.py
@@ -24,7 +24,6 @@ def console_mutex(params):
guest = params['guestname']
device = params.get('device', 'serial0')
- util = utils.Utils()
uri = params['uri']
try:
diff --git a/repos/domain/cpu_affinity.py b/repos/domain/cpu_affinity.py
index bd7d907..b4e6386 100644
--- a/repos/domain/cpu_affinity.py
+++ b/repos/domain/cpu_affinity.py
@@ -224,7 +224,6 @@ def cpu_affinity(params):
logger.info("the vcpu given is %s" % vcpu)
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
hypervisor = uri.split(':')[0]
diff --git a/repos/domain/cpu_topology.py b/repos/domain/cpu_topology.py
index 1bb57bc..8fca63a 100644
--- a/repos/domain/cpu_topology.py
+++ b/repos/domain/cpu_topology.py
@@ -196,7 +196,6 @@ def cpu_topology(params):
logger.info("cores is %s" % cores)
logger.info("threads is %s" % threads)
- util = utils.Utils()
uri = params['uri']
logger.info("the uri is %s" % uri)
diff --git a/repos/domain/create.py b/repos/domain/create.py
index 975b152..48fd502 100644
--- a/repos/domain/create.py
+++ b/repos/domain/create.py
@@ -81,7 +81,6 @@ def create(params):
return 1
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/domain/define.py b/repos/domain/define.py
index de34544..feb4abc 100644
--- a/repos/domain/define.py
+++ b/repos/domain/define.py
@@ -95,7 +95,6 @@ def define(params):
guesttype = params['guesttype']
test_result = False
- util = utils.Utils()
uri = params['uri']
hostname = util.parser_uri(uri)[1]
diff --git a/repos/domain/destroy.py b/repos/domain/destroy.py
index 025aba5..16af8c6 100644
--- a/repos/domain/destroy.py
+++ b/repos/domain/destroy.py
@@ -53,7 +53,6 @@ def destroy(params):
flags = params['flags']
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/domain/detach_disk.py b/repos/domain/detach_disk.py
index d894dc1..657aebb 100644
--- a/repos/domain/detach_disk.py
+++ b/repos/domain/detach_disk.py
@@ -56,7 +56,6 @@ def detach_disk(params):
test_result = False
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
domobj = conn.lookupByName(guestname)
diff --git a/repos/domain/detach_interface.py b/repos/domain/detach_interface.py
index 91c2729..b87b51d 100644
--- a/repos/domain/detach_interface.py
+++ b/repos/domain/detach_interface.py
@@ -54,7 +54,6 @@ def detach_interface(params):
test_result = False
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
macs = util.get_dom_mac_addr(guestname)
mac_list = macs.split("\n")
diff --git a/repos/domain/domain_blkinfo.py b/repos/domain/domain_blkinfo.py
index b320653..975173c 100644
--- a/repos/domain/domain_blkinfo.py
+++ b/repos/domain/domain_blkinfo.py
@@ -109,7 +109,6 @@ def domblkinfo(params):
logger.info("the name of guest is %s" % guestname)
logger.info("the block device is %s" % blockdev)
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/domain/domain_id.py b/repos/domain/domain_id.py
index c89eeaf..2d8f3e0 100644
--- a/repos/domain/domain_id.py
+++ b/repos/domain/domain_id.py
@@ -62,7 +62,6 @@ def domid(params):
logger.info("no running guest available")
return 1
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/domain/domain_uuid.py b/repos/domain/domain_uuid.py
index 41f381b..62a88ae 100644
--- a/repos/domain/domain_uuid.py
+++ b/repos/domain/domain_uuid.py
@@ -58,7 +58,6 @@ def domuuid(params):
guestname = params['guestname']
logger.info("guest name is %s" % guestname)
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/domain/domblkinfo.py b/repos/domain/domblkinfo.py
index b320653..975173c 100644
--- a/repos/domain/domblkinfo.py
+++ b/repos/domain/domblkinfo.py
@@ -109,7 +109,6 @@ def domblkinfo(params):
logger.info("the name of guest is %s" % guestname)
logger.info("the block device is %s" % blockdev)
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/domain/dump.py b/repos/domain/dump.py
index dcbc230..c1a1592 100644
--- a/repos/domain/dump.py
+++ b/repos/domain/dump.py
@@ -49,7 +49,6 @@ def check_guest_kernel(*args):
"""Check guest kernel version"""
(guestname, logger) = args
- util = utils.Utils()
chk = check.Check()
mac = util.get_dom_mac_addr(guestname)
@@ -144,7 +143,6 @@ def dump(params):
test_result = False
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
domobj = conn.lookupByName(guestname)
diff --git a/repos/domain/eventhandler.py b/repos/domain/eventhandler.py
index d01874a..30bf272 100644
--- a/repos/domain/eventhandler.py
+++ b/repos/domain/eventhandler.py
@@ -235,7 +235,6 @@ def eventhandler(params):
loop_start()
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/domain/ifstats.py b/repos/domain/ifstats.py
index 5bb85f7..a1de55c 100644
--- a/repos/domain/ifstats.py
+++ b/repos/domain/ifstats.py
@@ -45,7 +45,6 @@ def ifstats(params):
guestname = params['guestname']
test_result = False
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py
index 0ef1e5e..42b1b83 100644
--- a/repos/domain/install_image.py
+++ b/repos/domain/install_image.py
@@ -90,7 +90,6 @@ def install_image(params):
logger.info("the arch of guest is %s" % guestarch)
# Connect to local hypervisor connection URI
- util = utils.Utils()
hypervisor = util.get_hypervisor()
logger.info("the type of hypervisor is %s" % hypervisor)
diff --git a/repos/domain/install_linux_cdrom.py b/repos/domain/install_linux_cdrom.py
index 8976119..9da0374 100644
--- a/repos/domain/install_linux_cdrom.py
+++ b/repos/domain/install_linux_cdrom.py
@@ -232,7 +232,6 @@ def install_linux_cdrom(params):
logger.info("the name of guest is %s" % guestname)
logger.info("the type of guest is %s" % guesttype)
- util = utils.Utils()
hypervisor = util.get_hypervisor()
conn = libvirt.open(uri)
@@ -445,7 +444,6 @@ def install_linux_cdrom_clean(params):
guestname = params.get('guestname')
guesttype = params.get('guesttype')
- util = utils.Utils()
hypervisor = util.get_hypervisor()
if hypervisor == 'xen':
imgfullpath = os.path.join('/var/lib/xen/images', guestname)
diff --git a/repos/domain/install_linux_check.py b/repos/domain/install_linux_check.py
index a014f9b..e5d30c5 100644
--- a/repos/domain/install_linux_check.py
+++ b/repos/domain/install_linux_check.py
@@ -99,7 +99,6 @@ def install_linux_check(params):
logger.info("the name of guest is %s" % guestname)
# Connect to local hypervisor connection URI
- util = utils.Utils()
hypervisor = util.get_hypervisor()
logger.info("the type of hypervisor is %s" % hypervisor)
diff --git a/repos/domain/install_linux_net.py b/repos/domain/install_linux_net.py
index dbf6dc8..b12d132 100644
--- a/repos/domain/install_linux_net.py
+++ b/repos/domain/install_linux_net.py
@@ -216,7 +216,6 @@ def install_linux_net(params):
logger.info("the type of guest is %s" % guesttype)
logger.info("the installation method is %s" % installmethod)
- util = utils.Utils()
hypervisor = util.get_hypervisor()
macaddr = util.get_rand_mac()
@@ -440,7 +439,6 @@ def install_linux_net_clean(params):
guestname = params.get('guestname')
guesttype = params.get('guesttype')
- util = utils.Utils()
hypervisor = util.get_hypervisor()
if hypervisor == 'xen':
imgfullpath = os.path.join('/var/lib/xen/images', guestname)
diff --git a/repos/domain/install_windows_cdrom.py b/repos/domain/install_windows_cdrom.py
index 150a43b..39a733e 100644
--- a/repos/domain/install_windows_cdrom.py
+++ b/repos/domain/install_windows_cdrom.py
@@ -270,7 +270,6 @@ def install_windows_cdrom(params):
logger.info("the name of guest is %s" % guestname)
logger.info("the type of guest is %s" % guesttype)
- util = utils.Utils()
hypervisor = util.get_hypervisor()
if not params.has_key('macaddr'):
@@ -465,7 +464,6 @@ def install_windows_cdrom_clean(params):
guestname = params.get('guestname')
guesttype = params.get('guesttype')
- util = utils.Utils()
hypervisor = util.get_hypervisor()
if hypervisor == 'xen':
imgfullpath = os.path.join('/var/lib/xen/images', guestname)
diff --git a/repos/domain/migrate.py b/repos/domain/migrate.py
index 23a05a8..d1458a5 100644
--- a/repos/domain/migrate.py
+++ b/repos/domain/migrate.py
@@ -229,7 +229,6 @@ def migrate(params):
dsturi = "qemu+%s://%s/system" % (transport, target_machine)
# Connect to local hypervisor connection URI
- util = utils.Utils()
srcconn = libvirt.open(srcuri)
dstconn = libvirt.open(dsturi)
diff --git a/repos/domain/ownership_test.py b/repos/domain/ownership_test.py
index 5651412..3a85ef5 100644
--- a/repos/domain/ownership_test.py
+++ b/repos/domain/ownership_test.py
@@ -198,7 +198,6 @@ def ownership_test(params):
dynamic_ownership = params['dynamic_ownership']
use_nfs = params['use_nfs']
- util = utils.Utils()
# set env
logger.info("prepare the environment")
@@ -283,7 +282,6 @@ def ownership_test_clean(params):
logger = params['logger']
use_nfs = params['use_nfs']
- util = utils.Utils()
if use_nfs == 'enable':
if os.path.ismount("/mnt"):
diff --git a/repos/domain/reboot.py b/repos/domain/reboot.py
index 382704d..c2d50b4 100644
--- a/repos/domain/reboot.py
+++ b/repos/domain/reboot.py
@@ -41,7 +41,6 @@ def reboot(params):
domain_name = params['guestname']
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
hypervisor = util.get_hypervisor()
if hypervisor == "kvm":
diff --git a/repos/domain/restore.py b/repos/domain/restore.py
index f2adb02..a4c7917 100644
--- a/repos/domain/restore.py
+++ b/repos/domain/restore.py
@@ -86,7 +86,6 @@ def restore(params):
test_result = False
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
domobj = conn.lookupByName(guestname)
diff --git a/repos/domain/resume.py b/repos/domain/resume.py
index ac9e613..e737e35 100644
--- a/repos/domain/resume.py
+++ b/repos/domain/resume.py
@@ -54,7 +54,6 @@ def resume(params):
logger = params['logger']
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
# Resume domain
diff --git a/repos/domain/save.py b/repos/domain/save.py
index e2512a8..3e439d9 100644
--- a/repos/domain/save.py
+++ b/repos/domain/save.py
@@ -84,7 +84,6 @@ def save(params):
test_result = False
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
domobj = conn.lookupByName(guestname)
diff --git a/repos/domain/sched_params.py b/repos/domain/sched_params.py
index 549c684..b98ab0f 100644
--- a/repos/domain/sched_params.py
+++ b/repos/domain/sched_params.py
@@ -73,7 +73,6 @@ def sched_params(params):
keys, by assigning different value to 'weight' and 'cap'
to verify validity of the result
"""
- util = utils.Utils()
uri = params['uri']
hypervisor = util.get_hypervisor()
usage(params, hypervisor)
diff --git a/repos/domain/shutdown.py b/repos/domain/shutdown.py
index 657cdd7..014a2dd 100644
--- a/repos/domain/shutdown.py
+++ b/repos/domain/shutdown.py
@@ -55,7 +55,6 @@ def shutdown(params):
logger = params['logger']
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
domobj = conn.lookupByName(domname)
diff --git a/repos/domain/start.py b/repos/domain/start.py
index 2688aba..cd82bb6 100644
--- a/repos/domain/start.py
+++ b/repos/domain/start.py
@@ -70,7 +70,6 @@ def start(params):
return return_close(conn, logger, 1)
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
domobj = conn.lookupByName(domname)
diff --git a/repos/domain/suspend.py b/repos/domain/suspend.py
index 15efb1a..02ddcb7 100644
--- a/repos/domain/suspend.py
+++ b/repos/domain/suspend.py
@@ -54,7 +54,6 @@ def suspend(params):
logger = params['logger']
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/domain/undefine.py b/repos/domain/undefine.py
index bb188d2..ed92f49 100644
--- a/repos/domain/undefine.py
+++ b/repos/domain/undefine.py
@@ -41,7 +41,6 @@ def undefine(params):
test_result = False
# Connect to local hypervisor connection URI
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/domain/update_devflag.py b/repos/domain/update_devflag.py
index 8a2a160..18bcf30 100644
--- a/repos/domain/update_devflag.py
+++ b/repos/domain/update_devflag.py
@@ -158,7 +158,6 @@ def check_updated_device(params, output, util, guestip, domobj, srcfile):
def update_devflag(params):
"""Update virtual device to a domain from xml"""
- util = utils.Utils()
# Initiate and check parameters
params_check_result = check_params(params)
diff --git a/repos/interface/create.py b/repos/interface/create.py
index 0491986..2ab50b3 100644
--- a/repos/interface/create.py
+++ b/repos/interface/create.py
@@ -69,7 +69,6 @@ def create(params):
ifacename = params['ifacename']
- util = utils.Utils()
uri = params['uri']
try:
hostip = util.get_ip_address(ifacename)
diff --git a/repos/interface/define.py b/repos/interface/define.py
index 2e4512c..6f8d68c 100644
--- a/repos/interface/define.py
+++ b/repos/interface/define.py
@@ -50,7 +50,6 @@ def define(params):
ifacename = params['ifacename']
params['dhcp'] = 'yes'
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/interface/destroy.py b/repos/interface/destroy.py
index fd6d078..7bdd5d2 100644
--- a/repos/interface/destroy.py
+++ b/repos/interface/destroy.py
@@ -67,7 +67,6 @@ def destroy(params):
ifacename = params['ifacename']
- util = utils.Utils()
uri = params['uri']
try:
hostip = util.get_ip_address(ifacename)
diff --git a/repos/interface/undefine.py b/repos/interface/undefine.py
index 517ea21..884b7e1 100644
--- a/repos/interface/undefine.py
+++ b/repos/interface/undefine.py
@@ -48,7 +48,6 @@ def undefine(params):
ifacename = params['ifacename']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/libvirtd/qemu_hang.py b/repos/libvirtd/qemu_hang.py
index 4504640..c8b12c8 100644
--- a/repos/libvirtd/qemu_hang.py
+++ b/repos/libvirtd/qemu_hang.py
@@ -88,7 +88,6 @@ def qemu_hang(params):
logger = params['logger']
guestname = params['guestname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
@@ -127,7 +126,6 @@ def qemu_hang_clean(params):
""" clean testing environment """
logger = params['logger']
guestname = params['guestname']
- util = utils.Utils()
ret = get_domain_pid(util, logger, guestname)
cmd = "kill -CONT %s" % ret[1]
diff --git a/repos/libvirtd/restart.py b/repos/libvirtd/restart.py
index 81591f2..29f0798 100644
--- a/repos/libvirtd/restart.py
+++ b/repos/libvirtd/restart.py
@@ -88,7 +88,6 @@ def restart(params):
logger = params['logger']
guestname = params['guestname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/libvirtd/upstart.py b/repos/libvirtd/upstart.py
index 3fa9d2b..ca9291e 100644
--- a/repos/libvirtd/upstart.py
+++ b/repos/libvirtd/upstart.py
@@ -43,7 +43,6 @@ def libvirtd_check(util, logger):
def upstart(params):
"""Set libvirtd upstart"""
logger = params['logger']
- util = utils.Utils()
logger.info("chkconfig libvirtd off:")
cmd = "chkconfig libvirtd off"
@@ -159,7 +158,6 @@ def upstart(params):
def upstart_clean(params):
"""clean testing environment"""
logger = params['logger']
- util = utils.Utils()
if os.path.exists(INITCTL_CMD):
cmd = "initctl stop libvirtd"
diff --git a/repos/network/autostart.py b/repos/network/autostart.py
index 02997da..374f964 100644
--- a/repos/network/autostart.py
+++ b/repos/network/autostart.py
@@ -74,7 +74,6 @@ def autostart(params):
logger.error("Error: autostart value is invalid")
return 1
- util = utils.Utils()
uri = params['uri']
logger.info("uri address is %s" % uri)
diff --git a/repos/network/create.py b/repos/network/create.py
index 1bb0abe..4c5298b 100644
--- a/repos/network/create.py
+++ b/repos/network/create.py
@@ -44,7 +44,6 @@ def create(params):
logger = params['logger']
networkname = params['networkname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/network/define.py b/repos/network/define.py
index 0b0d9a5..884f529 100644
--- a/repos/network/define.py
+++ b/repos/network/define.py
@@ -54,7 +54,6 @@ def define(params):
networkname = params['networkname']
test_result = False
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/network/destroy.py b/repos/network/destroy.py
index 32d95ae..665c77f 100644
--- a/repos/network/destroy.py
+++ b/repos/network/destroy.py
@@ -48,7 +48,6 @@ def destroy(params):
test_result = False
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/network/network_list.py b/repos/network/network_list.py
index 67db632..8ed3fc3 100644
--- a/repos/network/network_list.py
+++ b/repos/network/network_list.py
@@ -159,7 +159,6 @@ def network_list(params):
if ret:
return 1
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/network/network_name.py b/repos/network/network_name.py
index b097348..99773b9 100644
--- a/repos/network/network_name.py
+++ b/repos/network/network_name.py
@@ -53,7 +53,6 @@ def netname(params):
else:
networkname = params['networkname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/network/network_uuid.py b/repos/network/network_uuid.py
index b5f9fcd..42b0dec 100644
--- a/repos/network/network_uuid.py
+++ b/repos/network/network_uuid.py
@@ -53,7 +53,6 @@ def netuuid(params):
else:
networkname = params['networkname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/network/start.py b/repos/network/start.py
index 44243d2..a6212b8 100644
--- a/repos/network/start.py
+++ b/repos/network/start.py
@@ -45,7 +45,6 @@ def start(params):
logger.info("the name of virtual network to be activated is %s" % \
networkname)
- util = utils.Utils()
uri = params['uri']
logger.info("uri address is %s" % uri)
diff --git a/repos/network/undefine.py b/repos/network/undefine.py
index a51aff5..bdb53b7 100644
--- a/repos/network/undefine.py
+++ b/repos/network/undefine.py
@@ -45,7 +45,6 @@ def undefine(params):
logger = params['logger']
networkname = params['networkname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/nodedevice/detach.py b/repos/nodedevice/detach.py
index 8fdc60f..37dbf6a 100644
--- a/repos/nodedevice/detach.py
+++ b/repos/nodedevice/detach.py
@@ -61,7 +61,6 @@ def detach(params):
original_driver = check_node_detach(pciaddress)
logger.info("original device driver: %s" % original_driver)
- util = utils.Utils()
uri = params['uri']
kernel_version = util.get_host_kernel_version()
diff --git a/repos/nodedevice/reattach.py b/repos/nodedevice/reattach.py
index 7fcd113..17a430b 100644
--- a/repos/nodedevice/reattach.py
+++ b/repos/nodedevice/reattach.py
@@ -60,7 +60,6 @@ def reattach(params):
original_driver = check_node_reattach(pciaddress)
logger.info("original device driver: %s" % original_driver)
- util = utils.Utils()
uri = params['uri']
kernel_version = util.get_host_kernel_version()
diff --git a/repos/nodedevice/reset.py b/repos/nodedevice/reset.py
index c5d953e..5e76ec3 100644
--- a/repos/nodedevice/reset.py
+++ b/repos/nodedevice/reset.py
@@ -39,7 +39,6 @@ def reset(params):
logger = params['logger']
pciaddress = params['pciaddress']
- util = utils.Utils()
uri = params['uri']
kernel_version = util.get_host_kernel_version()
diff --git a/repos/npiv/create_virtual_hba.py b/repos/npiv/create_virtual_hba.py
index 50d2223..b032c64 100644
--- a/repos/npiv/create_virtual_hba.py
+++ b/repos/npiv/create_virtual_hba.py
@@ -68,7 +68,6 @@ def create_virtual_hba(params):
if not usage(params):
return 1
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/regression/multiple_thread_block_on_domain_create.py b/repos/regression/multiple_thread_block_on_domain_create.py
index 5ea0fb8..035868e 100644
--- a/repos/regression/multiple_thread_block_on_domain_create.py
+++ b/repos/regression/multiple_thread_block_on_domain_create.py
@@ -124,7 +124,6 @@ def multiple_thread_block_on_domain_create(params):
logger.info("the type of guest is %s" % type)
logger.info("the number of guest we are going to install is %s" % num)
- util = utils.Utils()
hypervisor = util.get_hypervisor()
uri = params['uri']
diff --git a/repos/remoteAccess/tcp_setup.py b/repos/remoteAccess/tcp_setup.py
index 792bf89..dd9201b 100644
--- a/repos/remoteAccess/tcp_setup.py
+++ b/repos/remoteAccess/tcp_setup.py
@@ -164,7 +164,6 @@ def tcp_setup(params):
uri = "qemu+tcp://%s/system" % target_machine
- util = utils.Utils()
logger.info("the hostname of server is %s" % target_machine)
logger.info("the value of listen_tcp is %s" % listen_tcp)
@@ -203,7 +202,6 @@ def tcp_setup_clean(params):
listen_tcp = params['listen_tcp']
auth_tcp = params['auth_tcp']
- util = utils.Utils()
if auth_tcp == 'sasl':
saslpasswd2_delete = "%s -a libvirt -d %s" % (SASLPASSWD2, username)
diff --git a/repos/remoteAccess/tls_setup.py b/repos/remoteAccess/tls_setup.py
index b8bc540..ea1bf68 100644
--- a/repos/remoteAccess/tls_setup.py
+++ b/repos/remoteAccess/tls_setup.py
@@ -382,7 +382,6 @@ def tls_setup(params):
if pkipath:
uri += "?pkipath=%s" % pkipath
- util = utils.Utils()
local_machine = util.get_local_hostname()
logger.info("the hostname of server is %s" % target_machine)
@@ -446,7 +445,6 @@ def tls_setup_clean(params):
listen_tls = params['listen_tls']
auth_tls = params['auth_tls']
- util = utils.Utils()
cacert_rm = "rm -f %s/cacert.pem" % CA_FOLDER
ret, output = util.remote_exec_pexpect(target_machine, username,
password, cacert_rm)
diff --git a/repos/remoteAccess/unix_perm_sasl.py b/repos/remoteAccess/unix_perm_sasl.py
index d34ced3..6703b82 100644
--- a/repos/remoteAccess/unix_perm_sasl.py
+++ b/repos/remoteAccess/unix_perm_sasl.py
@@ -196,7 +196,6 @@ def unix_perm_sasl(params):
def unix_perm_sasl_clean(params):
"""clean testing environment"""
logger = params['logger']
- util = utils.Utils()
auth_unix_ro = params['auth_unix_ro']
auth_unix_rw = params['auth_unix_rw']
diff --git a/repos/sVirt/domain_nfs_start.py b/repos/sVirt/domain_nfs_start.py
index 10cca44..39122ba 100644
--- a/repos/sVirt/domain_nfs_start.py
+++ b/repos/sVirt/domain_nfs_start.py
@@ -152,7 +152,6 @@ def domain_nfs_start(params):
virt_use_nfs = params['virt_use_nfs']
root_squash = params['root_squash']
- util = utils.Utils()
# Connect to local hypervisor connection URI
uri = params['uri']
@@ -438,7 +437,6 @@ def domain_nfs_start_clean(params):
logger = params['logger']
guestname = params['guestname']
- util = utils.Utils()
# Connect to local hypervisor connection URI
uri = params['uri']
diff --git a/repos/snapshot/delete.py b/repos/snapshot/delete.py
index 4148d77..2e142d4 100644
--- a/repos/snapshot/delete.py
+++ b/repos/snapshot/delete.py
@@ -62,7 +62,6 @@ def delete(params):
guestname = params['guestname']
snapshotname = params['snapshotname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/snapshot/file_flag.py b/repos/snapshot/file_flag.py
index 9506ab2..fa22c41 100644
--- a/repos/snapshot/file_flag.py
+++ b/repos/snapshot/file_flag.py
@@ -73,7 +73,6 @@ def file_flag(params):
username = params['username']
password = params['password']
- util = utils.Utils()
chk = check.Check()
uri = params['uri']
conn = libvirt.open(uri)
@@ -113,5 +112,4 @@ def file_flag(params):
def file_flag_clean(params):
""" clean testing environment """
- util = utils.Utils()
return 0
diff --git a/repos/snapshot/flag_check.py b/repos/snapshot/flag_check.py
index dcd7658..ae10bfb 100644
--- a/repos/snapshot/flag_check.py
+++ b/repos/snapshot/flag_check.py
@@ -63,7 +63,6 @@ def flag_check(params):
else:
expected_result = "exist"
- util = utils.Utils()
chk = check.Check()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/snapshot/internal_create.py b/repos/snapshot/internal_create.py
index 757c9f3..87cc0aa 100644
--- a/repos/snapshot/internal_create.py
+++ b/repos/snapshot/internal_create.py
@@ -67,7 +67,6 @@ def internal_create(params):
if not params.has_key('snapshotname'):
params['snapshotname'] = str(int(time.time()))
- util = utils.Utils()
uri = params['uri']
logger.info("the uri is %s" % uri)
diff --git a/repos/snapshot/revert.py b/repos/snapshot/revert.py
index 985bdb0..6c0987e 100644
--- a/repos/snapshot/revert.py
+++ b/repos/snapshot/revert.py
@@ -46,7 +46,6 @@ def revert(params):
guestname = params['guestname']
snapshotname = params['snapshotname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/activate_pool.py b/repos/storage/activate_pool.py
index 665a3d0..646b396 100644
--- a/repos/storage/activate_pool.py
+++ b/repos/storage/activate_pool.py
@@ -44,7 +44,6 @@ def activate_pool(params):
poolname = params['poolname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/build_dir_pool.py b/repos/storage/build_dir_pool.py
index 10d3e1b..116a207 100644
--- a/repos/storage/build_dir_pool.py
+++ b/repos/storage/build_dir_pool.py
@@ -68,7 +68,6 @@ def build_dir_pool(params):
poolname = params['poolname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/build_disk_pool.py b/repos/storage/build_disk_pool.py
index 20884a8..e59b98f 100644
--- a/repos/storage/build_disk_pool.py
+++ b/repos/storage/build_disk_pool.py
@@ -83,7 +83,6 @@ def build_disk_pool(params):
poolname = params['poolname']
logger.info("the poolname is %s" % (poolname))
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/build_logical_pool.py b/repos/storage/build_logical_pool.py
index 78310ef..fd8818e 100644
--- a/repos/storage/build_logical_pool.py
+++ b/repos/storage/build_logical_pool.py
@@ -80,7 +80,6 @@ def build_logical_pool(params):
poolname = params['poolname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/build_netfs_pool.py b/repos/storage/build_netfs_pool.py
index dfc3130..5bdddf5 100644
--- a/repos/storage/build_netfs_pool.py
+++ b/repos/storage/build_netfs_pool.py
@@ -57,7 +57,6 @@ def build_netfs_pool(params):
poolname = params['poolname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/create_dir_pool.py b/repos/storage/create_dir_pool.py
index f5ae4ce..dd7526d 100644
--- a/repos/storage/create_dir_pool.py
+++ b/repos/storage/create_dir_pool.py
@@ -72,7 +72,6 @@ def create_dir_pool(params):
poolname = params['poolname']
pooltype = params['pooltype']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/create_dir_volume.py b/repos/storage/create_dir_volume.py
index 6dd973e..15927f3 100644
--- a/repos/storage/create_dir_volume.py
+++ b/repos/storage/create_dir_volume.py
@@ -118,7 +118,6 @@ def create_dir_volume(params):
volfomat is %s, capacity is %s" % \
(poolname, volname, volformat, capacity))
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/create_fs_pool.py b/repos/storage/create_fs_pool.py
index 8114dba..cad8c18 100644
--- a/repos/storage/create_fs_pool.py
+++ b/repos/storage/create_fs_pool.py
@@ -88,7 +88,6 @@ def create_fs_pool(params):
poolname = params['poolname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/create_iscsi_pool.py b/repos/storage/create_iscsi_pool.py
index 76181ff..61a1e98 100644
--- a/repos/storage/create_iscsi_pool.py
+++ b/repos/storage/create_iscsi_pool.py
@@ -65,7 +65,6 @@ def create_iscsi_pool(params):
poolname = params['poolname']
pooltype = params['pooltype']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/create_logical_volume.py b/repos/storage/create_logical_volume.py
index 62e513c..93f1d7f 100644
--- a/repos/storage/create_logical_volume.py
+++ b/repos/storage/create_logical_volume.py
@@ -93,7 +93,6 @@ def create_logical_volume(params):
volname = params['volname']
capacity = params['capacity']
- util = utils.Utils()
dicts = util.get_capacity_suffix_size(capacity)
params['capacity'] = dicts['capacity']
diff --git a/repos/storage/create_netfs_pool.py b/repos/storage/create_netfs_pool.py
index bbbc838..035a01a 100644
--- a/repos/storage/create_netfs_pool.py
+++ b/repos/storage/create_netfs_pool.py
@@ -103,7 +103,6 @@ def create_netfs_pool(params):
poolname = params['poolname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/create_netfs_volume.py b/repos/storage/create_netfs_volume.py
index 4bbe394..318878c 100644
--- a/repos/storage/create_netfs_volume.py
+++ b/repos/storage/create_netfs_volume.py
@@ -117,7 +117,6 @@ def create_netfs_volume(params):
volfomat is %s, capacity is %s" % \
(poolname, volname, volformat, capacity))
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/create_partition_volume.py b/repos/storage/create_partition_volume.py
index f8d8c62..7ec9130 100644
--- a/repos/storage/create_partition_volume.py
+++ b/repos/storage/create_partition_volume.py
@@ -100,7 +100,6 @@ def create_partition_volume(params):
volfomat is %s, capacity is %s" % \
(poolname, volname, volformat, capacity))
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/define_dir_pool.py b/repos/storage/define_dir_pool.py
index cd1997e..c1b48c3 100644
--- a/repos/storage/define_dir_pool.py
+++ b/repos/storage/define_dir_pool.py
@@ -65,7 +65,6 @@ def define_dir_pool(params):
logger = params['logger']
poolname = params['poolname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/define_disk_pool.py b/repos/storage/define_disk_pool.py
index 1a25e90..fe8215e 100644
--- a/repos/storage/define_disk_pool.py
+++ b/repos/storage/define_disk_pool.py
@@ -84,7 +84,6 @@ def define_disk_pool(params):
logger.info("the poolname is %s, pooltype is %s, sourcepath is %s" % \
(poolname, pooltype, sourcepath))
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/define_iscsi_pool.py b/repos/storage/define_iscsi_pool.py
index 8372a31..7b8d19a 100644
--- a/repos/storage/define_iscsi_pool.py
+++ b/repos/storage/define_iscsi_pool.py
@@ -78,7 +78,6 @@ def define_iscsi_pool(params):
srcname = params['sourcename']
srcpath = params['sourcepath']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/define_logical_pool.py b/repos/storage/define_logical_pool.py
index bd9f676..b097b1d 100644
--- a/repos/storage/define_logical_pool.py
+++ b/repos/storage/define_logical_pool.py
@@ -56,7 +56,6 @@ def define_logical_pool(params):
logger = params['logger']
poolname = params['poolname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/define_mpath_pool.py b/repos/storage/define_mpath_pool.py
index d5d81b1..3ede935 100644
--- a/repos/storage/define_mpath_pool.py
+++ b/repos/storage/define_mpath_pool.py
@@ -77,7 +77,6 @@ def define_mpath_pool(params):
logger.info("the poolname is %s, pooltype is %s" % (poolname, pooltype))
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/define_netfs_pool.py b/repos/storage/define_netfs_pool.py
index 372194d..e0c4694 100644
--- a/repos/storage/define_netfs_pool.py
+++ b/repos/storage/define_netfs_pool.py
@@ -56,7 +56,6 @@ def define_netfs_pool(params):
logger = params['logger']
poolname = params['poolname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/define_scsi_pool.py b/repos/storage/define_scsi_pool.py
index 834f5a0..e7dabc6 100644
--- a/repos/storage/define_scsi_pool.py
+++ b/repos/storage/define_scsi_pool.py
@@ -82,7 +82,6 @@ def define_scsi_pool(params):
logger.info("the poolname is %s, pooltype is %s, sourcename is %s" % \
(poolname, pooltype, sourcename))
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/delete_dir_volume.py b/repos/storage/delete_dir_volume.py
index b961f61..1c51abe 100644
--- a/repos/storage/delete_dir_volume.py
+++ b/repos/storage/delete_dir_volume.py
@@ -60,7 +60,6 @@ def delete_dir_volume(params):
poolname = params['poolname']
volname = params['volname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/delete_logical_pool.py b/repos/storage/delete_logical_pool.py
index 9c581fb..ee28782 100644
--- a/repos/storage/delete_logical_pool.py
+++ b/repos/storage/delete_logical_pool.py
@@ -75,7 +75,6 @@ def delete_logical_pool(params):
poolname = params['poolname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/delete_logical_volume.py b/repos/storage/delete_logical_volume.py
index cd30bac..d3e69be 100644
--- a/repos/storage/delete_logical_volume.py
+++ b/repos/storage/delete_logical_volume.py
@@ -80,7 +80,6 @@ def delete_logical_volume(params):
poolname = params['poolname']
volname = params['volname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/delete_netfs_volume.py b/repos/storage/delete_netfs_volume.py
index f893c94..f284b5f 100644
--- a/repos/storage/delete_netfs_volume.py
+++ b/repos/storage/delete_netfs_volume.py
@@ -60,7 +60,6 @@ def delete_netfs_volume(params):
poolname = params['poolname']
volname = params['volname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/delete_partition_volume.py b/repos/storage/delete_partition_volume.py
index 3d01346..025a8f3 100644
--- a/repos/storage/delete_partition_volume.py
+++ b/repos/storage/delete_partition_volume.py
@@ -85,7 +85,6 @@ def delete_partition_volume(params):
logger.info("the poolname is %s, volname is %s" % (poolname, volname))
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/destroy_pool.py b/repos/storage/destroy_pool.py
index c5797ee..762dea6 100644
--- a/repos/storage/destroy_pool.py
+++ b/repos/storage/destroy_pool.py
@@ -59,7 +59,6 @@ def destroy_pool(params):
return 1
poolname = params['poolname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/pool_name.py b/repos/storage/pool_name.py
index cf266de..e1b0138 100644
--- a/repos/storage/pool_name.py
+++ b/repos/storage/pool_name.py
@@ -43,7 +43,6 @@ def pool_name(params):
else:
poolname = params['poolname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
diff --git a/repos/storage/pool_uuid.py b/repos/storage/pool_uuid.py
index 796b842..28875c1 100644
--- a/repos/storage/pool_uuid.py
+++ b/repos/storage/pool_uuid.py
@@ -43,7 +43,6 @@ def pool_uuid(params):
else:
poolname = params['poolname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
logger.info("the uri is %s" % uri)
diff --git a/repos/storage/undefine_pool.py b/repos/storage/undefine_pool.py
index 5e8e141..c2865c1 100644
--- a/repos/storage/undefine_pool.py
+++ b/repos/storage/undefine_pool.py
@@ -54,7 +54,6 @@ def undefine_pool(params):
logger = params['logger']
poolname = params['poolname']
- util = utils.Utils()
uri = params['uri']
conn = libvirt.open(uri)
--
1.7.7.5
More information about the libvir-list
mailing list