On 2012年03月29日 19:38, Guannan Ren wrote: ACK with reorgnize the sentence like: libvirt-test-api.py: Check whether the absolute path of testsuit is in sys.path, add it if not. As the original sentence sounds like we already do like that.

*remove the invoking for append_path() in all of testcases --- repos/domain/attach_disk.py | 11 ----------- repos/domain/attach_interface.py | 11 ----------- repos/domain/autostart.py | 11 ----------- repos/domain/balloon_memory.py | 11 ----------- repos/domain/blkstats.py | 5 ----- repos/domain/cpu_affinity.py | 11 ----------- repos/domain/cpu_topology.py | 11 ----------- repos/domain/create.py | 11 ----------- repos/domain/define.py | 11 ----------- repos/domain/destroy.py | 11 ----------- repos/domain/detach_disk.py | 11 ----------- repos/domain/detach_interface.py | 11 ----------- repos/domain/domain_blkinfo.py | 11 ----------- repos/domain/domain_id.py | 11 ----------- repos/domain/domain_list.py | 13 ------------- repos/domain/domain_name.py | 11 ----------- repos/domain/domain_uuid.py | 11 ----------- repos/domain/dump.py | 11 ----------- repos/domain/eventhandler.py | 11 ----------- repos/domain/hostname.py | 11 ----------- repos/domain/ifstats.py | 11 ----------- repos/domain/install_image.py | 12 ------------ repos/domain/install_linux_cdrom.py | 12 ------------ repos/domain/install_linux_check.py | 12 ------------ repos/domain/install_linux_net.py | 12 ------------ repos/domain/install_windows_cdrom.py | 12 ------------ repos/domain/migrate.py | 11 ----------- repos/domain/ownership_test.py | 15 +++------------ repos/domain/reboot.py | 11 ----------- repos/domain/restore.py | 11 ----------- repos/domain/resume.py | 14 +------------- repos/domain/save.py | 11 ----------- repos/domain/sched_params.py | 5 ----- repos/domain/shutdown.py | 13 +------------ repos/domain/start.py | 13 +------------ repos/domain/suspend.py | 14 +------------- repos/domain/undefine.py | 11 ----------- repos/domain/update_devflag.py | 12 ------------ repos/interface/create.py | 11 ----------- repos/interface/define.py | 11 ----------- repos/interface/destroy.py | 11 ----------- repos/interface/iface_list.py | 11 ----------- repos/interface/iface_mac.py | 11 ----------- repos/interface/iface_name.py | 11 ----------- repos/interface/undefine.py | 12 ------------ repos/libvirtd/qemu_hang.py | 9 --------- repos/libvirtd/restart.py | 9 --------- repos/libvirtd/upstart.py | 9 --------- repos/network/autostart.py | 12 ------------ repos/network/create.py | 11 ----------- repos/network/define.py | 12 ------------ repos/network/destroy.py | 11 ----------- repos/network/network_list.py | 11 ----------- repos/network/network_name.py | 11 ----------- repos/network/network_uuid.py | 11 ----------- repos/network/start.py | 11 ----------- repos/network/undefine.py | 11 ----------- repos/nodedevice/detach.py | 11 ----------- repos/nodedevice/reattach.py | 12 ------------ repos/nodedevice/reset.py | 11 ----------- repos/npiv/create_virtual_hba.py | 12 ------------ .../multiple_thread_block_on_domain_create.py | 12 ------------ repos/remoteAccess/tcp_setup.py | 11 ----------- repos/remoteAccess/tls_setup.py | 11 ----------- repos/remoteAccess/unix_perm_sasl.py | 14 +------------- repos/sVirt/domain_nfs_start.py | 11 +---------- repos/snapshot/delete.py | 11 ----------- repos/snapshot/file_flag.py | 11 ----------- repos/snapshot/flag_check.py | 11 ----------- repos/snapshot/internal_create.py | 11 ----------- repos/snapshot/revert.py | 11 ----------- repos/snapshot/snapshot_list.py | 11 ----------- repos/storage/activate_pool.py | 12 ------------ repos/storage/build_dir_pool.py | 11 ----------- repos/storage/build_disk_pool.py | 11 ----------- repos/storage/build_logical_pool.py | 12 ------------ repos/storage/build_netfs_pool.py | 12 ------------ repos/storage/create_dir_pool.py | 11 ----------- repos/storage/create_dir_volume.py | 11 ----------- repos/storage/create_fs_pool.py | 11 ----------- repos/storage/create_iscsi_pool.py | 11 ----------- repos/storage/create_logical_volume.py | 11 ----------- repos/storage/create_netfs_pool.py | 11 ----------- repos/storage/create_netfs_volume.py | 11 ----------- repos/storage/create_partition_volume.py | 11 ----------- repos/storage/define_dir_pool.py | 11 ----------- repos/storage/define_disk_pool.py | 11 ----------- repos/storage/define_iscsi_pool.py | 12 ------------ repos/storage/define_logical_pool.py | 11 ----------- repos/storage/define_mpath_pool.py | 11 ----------- repos/storage/define_netfs_pool.py | 12 ------------ repos/storage/define_scsi_pool.py | 11 ----------- repos/storage/delete_dir_volume.py | 12 ------------ repos/storage/delete_logical_pool.py | 12 ------------ repos/storage/delete_logical_volume.py | 12 ------------ repos/storage/delete_netfs_volume.py | 12 ------------ repos/storage/delete_partition_volume.py | 11 ----------- repos/storage/destroy_pool.py | 11 ----------- repos/storage/pool_name.py | 11 ----------- repos/storage/pool_uuid.py | 11 ----------- repos/storage/undefine_pool.py | 12 ------------ 101 files changed, 9 insertions(+), 1125 deletions(-) diff --git a/repos/domain/attach_disk.py b/repos/domain/attach_disk.py index c7aa20b..7a759dd 100644 --- a/repos/domain/attach_disk.py +++ b/repos/domain/attach_disk.py @@ -21,17 +21,6 @@ import sys import time import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/attach_interface.py b/repos/domain/attach_interface.py index c4adaee..2545a35 100644 --- a/repos/domain/attach_interface.py +++ b/repos/domain/attach_interface.py @@ -18,17 +18,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/autostart.py b/repos/domain/autostart.py index 17c39b2..8861650 100644 --- a/repos/domain/autostart.py +++ b/repos/domain/autostart.py @@ -15,17 +15,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/balloon_memory.py b/repos/domain/balloon_memory.py index adfc96b..b35f598 100644 --- a/repos/domain/balloon_memory.py +++ b/repos/domain/balloon_memory.py @@ -12,17 +12,6 @@ import time import math from xml.dom import minidom -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/blkstats.py b/repos/domain/blkstats.py index fd02312..03cadee 100644 --- a/repos/domain/blkstats.py +++ b/repos/domain/blkstats.py @@ -15,11 +15,6 @@ import os import sys import time -dir = os.path.dirname(sys.modules[__name__].__file__) -absdir = os.path.abspath(dir) -rootdir = os.path.split(os.path.split(absdir)[0])[0] -sys.path.append(rootdir) - import exception from lib import connectAPI from lib import domainAPI diff --git a/repos/domain/cpu_affinity.py b/repos/domain/cpu_affinity.py index fdeaa02..5f0bdf7 100644 --- a/repos/domain/cpu_affinity.py +++ b/repos/domain/cpu_affinity.py @@ -20,17 +20,6 @@ import commands import math from xml.dom import minidom -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/cpu_topology.py b/repos/domain/cpu_topology.py index c319320..1ec78e6 100644 --- a/repos/domain/cpu_topology.py +++ b/repos/domain/cpu_topology.py @@ -27,17 +27,6 @@ import sys import time from xml.dom import minidom -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/create.py b/repos/domain/create.py index 7756b68..c67534a 100644 --- a/repos/domain/create.py +++ b/repos/domain/create.py @@ -27,17 +27,6 @@ import re import sys import time -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/define.py b/repos/domain/define.py index f60b247..cf52eb3 100644 --- a/repos/domain/define.py +++ b/repos/domain/define.py @@ -29,17 +29,6 @@ import commands import string import pexpect -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/destroy.py b/repos/domain/destroy.py index 9854134..d04c427 100644 --- a/repos/domain/destroy.py +++ b/repos/domain/destroy.py @@ -14,17 +14,6 @@ import sys import re import time -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/detach_disk.py b/repos/domain/detach_disk.py index 51a6a7d..49a5e2d 100644 --- a/repos/domain/detach_disk.py +++ b/repos/domain/detach_disk.py @@ -19,17 +19,6 @@ import re import sys import time -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/detach_interface.py b/repos/domain/detach_interface.py index 8819744..e9f35c1 100644 --- a/repos/domain/detach_interface.py +++ b/repos/domain/detach_interface.py @@ -19,17 +19,6 @@ import re import sys import time -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/domain_blkinfo.py b/repos/domain/domain_blkinfo.py index a06c3ec..d254cb9 100644 --- a/repos/domain/domain_blkinfo.py +++ b/repos/domain/domain_blkinfo.py @@ -14,17 +14,6 @@ import sys import re import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/domain_id.py b/repos/domain/domain_id.py index ce18e80..630d234 100644 --- a/repos/domain/domain_id.py +++ b/repos/domain/domain_id.py @@ -13,17 +13,6 @@ import sys import re import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/domain_list.py b/repos/domain/domain_list.py index c3f920a..ebe8890 100644 --- a/repos/domain/domain_list.py +++ b/repos/domain/domain_list.py @@ -14,24 +14,11 @@ import sys import re import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - - CONFIG_DIR = '/etc/libvirt/qemu' RUNNING_DIR = '/var/run/libvirt/qemu' VIRSH_QUIET_LIST = "virsh --quiet list %s|awk '{print $2}'" VIRSH_LIST = "virsh list %s" - def get_option_list(params): """return options we need to test """ diff --git a/repos/domain/domain_name.py b/repos/domain/domain_name.py index 3da48f2..b727c0a 100644 --- a/repos/domain/domain_name.py +++ b/repos/domain/domain_name.py @@ -13,17 +13,6 @@ import sys import re import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - VIRSH_DOMNAME = "virsh domname" VIRSH_IDS = "virsh --quiet list |awk '{print $1}'" VIRSH_DOMS = "virsh --quiet list |awk '{print $2}'" diff --git a/repos/domain/domain_uuid.py b/repos/domain/domain_uuid.py index 705da56..45a0aed 100644 --- a/repos/domain/domain_uuid.py +++ b/repos/domain/domain_uuid.py @@ -13,17 +13,6 @@ import sys import re import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/dump.py b/repos/domain/dump.py index 29cbefc..62cbf3e 100644 --- a/repos/domain/dump.py +++ b/repos/domain/dump.py @@ -18,17 +18,6 @@ import sys import time import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/eventhandler.py b/repos/domain/eventhandler.py index 6ed8f03..0945c4a 100644 --- a/repos/domain/eventhandler.py +++ b/repos/domain/eventhandler.py @@ -20,17 +20,6 @@ import sys import time import threading -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import eventAPI from lib import domainAPI diff --git a/repos/domain/hostname.py b/repos/domain/hostname.py index 75c1913..25fa3b3 100644 --- a/repos/domain/hostname.py +++ b/repos/domain/hostname.py @@ -13,17 +13,6 @@ import sys import re import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - VIRSH_HOSTNAME = "virsh hostname" def hostname(params): diff --git a/repos/domain/ifstats.py b/repos/domain/ifstats.py index c6210e7..2fc2a00 100644 --- a/repos/domain/ifstats.py +++ b/repos/domain/ifstats.py @@ -16,17 +16,6 @@ import re import sys import time -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py index b04d8b8..b155eb7 100644 --- a/repos/domain/install_image.py +++ b/repos/domain/install_image.py @@ -27,18 +27,6 @@ import time import copy import urllib -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -homepath = result.group(0) -append_path(homepath) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/install_linux_cdrom.py b/repos/domain/install_linux_cdrom.py index 5a5bbf1..9bad1a8 100644 --- a/repos/domain/install_linux_cdrom.py +++ b/repos/domain/install_linux_cdrom.py @@ -29,18 +29,6 @@ import commands import shutil import urllib -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -homepath = result.group(0) -append_path(homepath) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/install_linux_check.py b/repos/domain/install_linux_check.py index 58ee162..c80c098 100644 --- a/repos/domain/install_linux_check.py +++ b/repos/domain/install_linux_check.py @@ -28,18 +28,6 @@ import time import copy import math -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -homepath = result.group(0) -append_path(homepath) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/install_linux_net.py b/repos/domain/install_linux_net.py index f42bfa0..f05602c 100644 --- a/repos/domain/install_linux_net.py +++ b/repos/domain/install_linux_net.py @@ -34,18 +34,6 @@ import commands import shutil import urllib -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -homepath = result.group(0) -append_path(homepath) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/install_windows_cdrom.py b/repos/domain/install_windows_cdrom.py index 1045353..f000f50 100644 --- a/repos/domain/install_windows_cdrom.py +++ b/repos/domain/install_windows_cdrom.py @@ -28,18 +28,6 @@ import copy import commands import shutil -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -homepath = result.group(0) -append_path(homepath) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/migrate.py b/repos/domain/migrate.py index ed07edd..780fe4f 100644 --- a/repos/domain/migrate.py +++ b/repos/domain/migrate.py @@ -45,17 +45,6 @@ import pexpect import string import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib.domainAPI import * from utils.Python import utils diff --git a/repos/domain/ownership_test.py b/repos/domain/ownership_test.py index b73e3e3..df56357 100644 --- a/repos/domain/ownership_test.py +++ b/repos/domain/ownership_test.py @@ -22,23 +22,14 @@ import os import re import sys -QEMU_CONF = "/etc/libvirt/qemu.conf" -SAVE_FILE = "/mnt/test.save" -TEMP_FILE = "/tmp/test.save" - -def append_path(path): - """Append root path of package""" - if path not in sys.path: - sys.path.append(path) - from lib import connectAPI from lib import domainAPI from utils.Python import utils from exception import LibvirtAPI -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) +QEMU_CONF = "/etc/libvirt/qemu.conf" +SAVE_FILE = "/mnt/test.save" +TEMP_FILE = "/tmp/test.save" def return_close(conn, logger, ret): """close hypervisor connection and return the given value""" diff --git a/repos/domain/reboot.py b/repos/domain/reboot.py index a930157..36e406f 100644 --- a/repos/domain/reboot.py +++ b/repos/domain/reboot.py @@ -15,17 +15,6 @@ import sys import re import time -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/restore.py b/repos/domain/restore.py index 11752da..fea32e6 100644 --- a/repos/domain/restore.py +++ b/repos/domain/restore.py @@ -16,17 +16,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/resume.py b/repos/domain/resume.py index 0840501..273e0fa 100644 --- a/repos/domain/resume.py +++ b/repos/domain/resume.py @@ -11,24 +11,12 @@ __all__ = ['resume', 'check_params', 'parse_opts', 'usage', - 'version', - 'append_path'] + 'version',] import os import sys import re -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/save.py b/repos/domain/save.py index 7371ba6..2c95be1 100644 --- a/repos/domain/save.py +++ b/repos/domain/save.py @@ -16,17 +16,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/sched_params.py b/repos/domain/sched_params.py index 30f07b0..d9c972a 100644 --- a/repos/domain/sched_params.py +++ b/repos/domain/sched_params.py @@ -20,11 +20,6 @@ import sys import time import commands -dir = os.path.dirname(sys.modules[__name__].__file__) -absdir = os.path.abspath(dir) -rootdir = os.path.split(os.path.split(absdir)[0])[0] -sys.path.append(rootdir) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/shutdown.py b/repos/domain/shutdown.py index 3f23fc2..6a0ce6a 100644 --- a/repos/domain/shutdown.py +++ b/repos/domain/shutdown.py @@ -8,24 +8,13 @@ __date__ = "Tue Oct 27, 2009" __version__ = "0.1.0" __credits__ = "Copyright (C) 2009 Red Hat, Inc." __all__ = ['shutdown', 'check_params', 'parse_opts', - 'usage', 'version', 'append_path'] + 'usage', 'version'] import os import sys import re import time -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/start.py b/repos/domain/start.py index 6dadd07..fe6c2fd 100644 --- a/repos/domain/start.py +++ b/repos/domain/start.py @@ -9,24 +9,13 @@ __date__ = "Tue Oct 27, 2009" __version__ = "0.1.0" __credits__ = "Copyright (C) 2009, 2012 Red Hat, Inc." __all__ = ['start', 'check_params', 'parse_opts', - 'usage', 'version', 'append_path'] + 'usage', 'version'] import os import sys import re import time -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/suspend.py b/repos/domain/suspend.py index d0f7548..7ceaa8c 100644 --- a/repos/domain/suspend.py +++ b/repos/domain/suspend.py @@ -8,17 +8,6 @@ import sys import re import time -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils @@ -31,8 +20,7 @@ __all__ = ['suspend', 'check_params', 'parse_opts', 'usage', - 'version', - 'append_path'] + 'version'] def return_close(conn, logger, ret): conn.close() diff --git a/repos/domain/undefine.py b/repos/domain/undefine.py index 31b14bb..12256fb 100644 --- a/repos/domain/undefine.py +++ b/repos/domain/undefine.py @@ -14,17 +14,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/domain/update_devflag.py b/repos/domain/update_devflag.py index 29ede7c..2a9b8b2 100644 --- a/repos/domain/update_devflag.py +++ b/repos/domain/update_devflag.py @@ -23,18 +23,6 @@ import sys import time from xml.dom import minidom - -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/interface/create.py b/repos/interface/create.py index 29c413b..59a08fd 100644 --- a/repos/interface/create.py +++ b/repos/interface/create.py @@ -16,17 +16,6 @@ import re import sys import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import interfaceAPI from utils.Python import utils diff --git a/repos/interface/define.py b/repos/interface/define.py index 60c9f89..c978e1e 100644 --- a/repos/interface/define.py +++ b/repos/interface/define.py @@ -15,17 +15,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import interfaceAPI from utils.Python import utils diff --git a/repos/interface/destroy.py b/repos/interface/destroy.py index 82b52c1..9d82244 100644 --- a/repos/interface/destroy.py +++ b/repos/interface/destroy.py @@ -16,17 +16,6 @@ import re import sys import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import interfaceAPI from utils.Python import utils diff --git a/repos/interface/iface_list.py b/repos/interface/iface_list.py index 3ac8413..e017ca3 100644 --- a/repos/interface/iface_list.py +++ b/repos/interface/iface_list.py @@ -14,17 +14,6 @@ import sys import re import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - VIRSH_QUIET_IFACE_LIST = "virsh --quiet iface-list %s | awk '{print ""$%s""}'" NETWORK_CONFIG = "/etc/sysconfig/network-scripts/" IFCONFIG_DRIVER = "ifconfig %s | sed 's/[ \t].*//;/^$/d'" diff --git a/repos/interface/iface_mac.py b/repos/interface/iface_mac.py index 7361b74..a3853c3 100644 --- a/repos/interface/iface_mac.py +++ b/repos/interface/iface_mac.py @@ -13,17 +13,6 @@ import sys import re import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - VIRSH_QUIET_IFACE_LIST = "virsh --quiet iface-list --all | awk '{print ""$%s""}'" GET_MAC = "ip link show %s |sed -n '2p'| awk '{print $2}'" VIRSH_IFACE_MAC = "virsh iface-mac %s" diff --git a/repos/interface/iface_name.py b/repos/interface/iface_name.py index 150167d..58a8262 100644 --- a/repos/interface/iface_name.py +++ b/repos/interface/iface_name.py @@ -13,17 +13,6 @@ import sys import re import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - VIRSH_QUIET_IFACE_LIST = "virsh --quiet iface-list --all | awk '{print ""$%s""}'" GET_MAC = "ip link show %s |sed -n '2p'| awk '{print $2}'" VIRSH_IFACE_NAME = "virsh iface-name %s" diff --git a/repos/interface/undefine.py b/repos/interface/undefine.py index 8c3a6b7..5d4170d 100644 --- a/repos/interface/undefine.py +++ b/repos/interface/undefine.py @@ -16,24 +16,12 @@ import re import sys #import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import interfaceAPI from utils.Python import utils from utils.Python import xmlbuilder from exception import LibvirtAPI - def usage(params): """Verify inputing parameter dictionary""" keys = ['ifacename'] diff --git a/repos/libvirtd/qemu_hang.py b/repos/libvirtd/qemu_hang.py index 234eb2c..31bdef1 100644 --- a/repos/libvirtd/qemu_hang.py +++ b/repos/libvirtd/qemu_hang.py @@ -17,15 +17,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path not in sys.path: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/libvirtd/restart.py b/repos/libvirtd/restart.py index 08e0a65..9200c36 100644 --- a/repos/libvirtd/restart.py +++ b/repos/libvirtd/restart.py @@ -17,15 +17,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path not in sys.path: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/libvirtd/upstart.py b/repos/libvirtd/upstart.py index a47058b..c51bd07 100644 --- a/repos/libvirtd/upstart.py +++ b/repos/libvirtd/upstart.py @@ -13,15 +13,6 @@ import re import sys import time -def append_path(path): - """Append root path of package""" - if path not in sys.path: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from utils.Python import utils from shutil import copy diff --git a/repos/network/autostart.py b/repos/network/autostart.py index 9c7d7c4..80a4729 100644 --- a/repos/network/autostart.py +++ b/repos/network/autostart.py @@ -15,23 +15,11 @@ import re import sys import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import networkAPI from utils.Python import utils from exception import LibvirtAPI - def check_params(params): """Verify inputing parameter dictionary""" diff --git a/repos/network/create.py b/repos/network/create.py index 5665be4..506a034 100644 --- a/repos/network/create.py +++ b/repos/network/create.py @@ -14,17 +14,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import networkAPI from utils.Python import utils diff --git a/repos/network/define.py b/repos/network/define.py index 0152030..1568382 100644 --- a/repos/network/define.py +++ b/repos/network/define.py @@ -14,24 +14,12 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import networkAPI from utils.Python import utils from utils.Python import xmlbuilder from exception import LibvirtAPI - def usage(params): """Verify inputing parameter dictionary""" logger = params['logger'] diff --git a/repos/network/destroy.py b/repos/network/destroy.py index 8aab2d9..4dc8cff 100644 --- a/repos/network/destroy.py +++ b/repos/network/destroy.py @@ -12,17 +12,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import networkAPI from utils.Python import utils diff --git a/repos/network/network_list.py b/repos/network/network_list.py index d59203b..986f20a 100644 --- a/repos/network/network_list.py +++ b/repos/network/network_list.py @@ -14,17 +14,6 @@ import sys import re import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import networkAPI from utils.Python import utils diff --git a/repos/network/network_name.py b/repos/network/network_name.py index 1364e6f..ea3ea3d 100644 --- a/repos/network/network_name.py +++ b/repos/network/network_name.py @@ -14,17 +14,6 @@ import sys import re import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import networkAPI from utils.Python import utils diff --git a/repos/network/network_uuid.py b/repos/network/network_uuid.py index 7b0743c..5ac987e 100644 --- a/repos/network/network_uuid.py +++ b/repos/network/network_uuid.py @@ -14,17 +14,6 @@ import sys import re import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import networkAPI from utils.Python import utils diff --git a/repos/network/start.py b/repos/network/start.py index 795edd2..0c0610f 100644 --- a/repos/network/start.py +++ b/repos/network/start.py @@ -15,17 +15,6 @@ import re import sys import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import networkAPI from utils.Python import utils diff --git a/repos/network/undefine.py b/repos/network/undefine.py index bc8c100..f5ca35b 100644 --- a/repos/network/undefine.py +++ b/repos/network/undefine.py @@ -14,17 +14,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import networkAPI from utils.Python import utils diff --git a/repos/nodedevice/detach.py b/repos/nodedevice/detach.py index d5be20d..54944cb 100644 --- a/repos/nodedevice/detach.py +++ b/repos/nodedevice/detach.py @@ -15,17 +15,6 @@ import re import sys import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import nodedevAPI from utils.Python import utils diff --git a/repos/nodedevice/reattach.py b/repos/nodedevice/reattach.py index 89cd4cf..722f8d0 100644 --- a/repos/nodedevice/reattach.py +++ b/repos/nodedevice/reattach.py @@ -15,23 +15,11 @@ import re import sys import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import nodedevAPI from utils.Python import utils from exception import LibvirtAPI - def usage(params): """Verify inputing parameter dictionary""" keys = ['pciaddress'] diff --git a/repos/nodedevice/reset.py b/repos/nodedevice/reset.py index 4f72132..f52245a 100644 --- a/repos/nodedevice/reset.py +++ b/repos/nodedevice/reset.py @@ -14,17 +14,6 @@ import re import sys import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import nodedevAPI from utils.Python import utils diff --git a/repos/npiv/create_virtual_hba.py b/repos/npiv/create_virtual_hba.py index 6a77d95..003de0a 100644 --- a/repos/npiv/create_virtual_hba.py +++ b/repos/npiv/create_virtual_hba.py @@ -16,23 +16,11 @@ import commands import xml.dom.minidom from utils.Python import xmlbuilder -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import nodedevAPI from utils.Python import utils from exception import LibvirtAPI - def usage(params): """Verify input parameters""" diff --git a/repos/regression/multiple_thread_block_on_domain_create.py b/repos/regression/multiple_thread_block_on_domain_create.py index 7c962b8..46a36c3 100644 --- a/repos/regression/multiple_thread_block_on_domain_create.py +++ b/repos/regression/multiple_thread_block_on_domain_create.py @@ -18,18 +18,6 @@ import urllib import getpass from threading import Thread -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -homepath = result.group(0) -append_path(homepath) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/remoteAccess/tcp_setup.py b/repos/remoteAccess/tcp_setup.py index da670fc..db4fbe0 100644 --- a/repos/remoteAccess/tcp_setup.py +++ b/repos/remoteAccess/tcp_setup.py @@ -23,17 +23,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from utils.Python import utils from exception import LibvirtAPI diff --git a/repos/remoteAccess/tls_setup.py b/repos/remoteAccess/tls_setup.py index 152e335..d5e2c88 100644 --- a/repos/remoteAccess/tls_setup.py +++ b/repos/remoteAccess/tls_setup.py @@ -30,17 +30,6 @@ import string import commands import shutil -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from utils.Python import utils from exception import LibvirtAPI diff --git a/repos/remoteAccess/unix_perm_sasl.py b/repos/remoteAccess/unix_perm_sasl.py index 9f4b3c9..d43c146 100644 --- a/repos/remoteAccess/unix_perm_sasl.py +++ b/repos/remoteAccess/unix_perm_sasl.py @@ -20,21 +20,9 @@ import os import re import sys import commands - from pwd import getpwnam -from utils.Python import utils - -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) +from utils.Python import utils from lib import connectAPI from exception import LibvirtAPI diff --git a/repos/sVirt/domain_nfs_start.py b/repos/sVirt/domain_nfs_start.py index b54cc7d..f7aa2ab 100644 --- a/repos/sVirt/domain_nfs_start.py +++ b/repos/sVirt/domain_nfs_start.py @@ -26,22 +26,13 @@ import os import re import sys -QEMU_CONF = "/etc/libvirt/qemu.conf" - -def append_path(path): - """Append root path of package""" - if path not in sys.path: - sys.path.append(path) - from lib import connectAPI from lib import domainAPI from utils.Python import utils from exception import LibvirtAPI from shutil import copy -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) +QEMU_CONF = "/etc/libvirt/qemu.conf" def return_close(conn, logger, ret): """close hypervisor connection and return the given value""" diff --git a/repos/snapshot/delete.py b/repos/snapshot/delete.py index 5b54462..a767d49 100644 --- a/repos/snapshot/delete.py +++ b/repos/snapshot/delete.py @@ -14,17 +14,6 @@ import os import sys import re -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import snapshotAPI from lib import domainAPI diff --git a/repos/snapshot/file_flag.py b/repos/snapshot/file_flag.py index d32fb52..b000ee5 100644 --- a/repos/snapshot/file_flag.py +++ b/repos/snapshot/file_flag.py @@ -14,17 +14,6 @@ import sys import re import time -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/snapshot/flag_check.py b/repos/snapshot/flag_check.py index f74c540..5ec65cf 100644 --- a/repos/snapshot/flag_check.py +++ b/repos/snapshot/flag_check.py @@ -14,17 +14,6 @@ import sys import re import time -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import domainAPI from utils.Python import utils diff --git a/repos/snapshot/internal_create.py b/repos/snapshot/internal_create.py index aab69c5..2e3e7df 100644 --- a/repos/snapshot/internal_create.py +++ b/repos/snapshot/internal_create.py @@ -15,17 +15,6 @@ import re import time import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import snapshotAPI from lib import domainAPI diff --git a/repos/snapshot/revert.py b/repos/snapshot/revert.py index 9465a91..7162d47 100644 --- a/repos/snapshot/revert.py +++ b/repos/snapshot/revert.py @@ -13,17 +13,6 @@ import os import sys import re -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import snapshotAPI from lib import domainAPI diff --git a/repos/snapshot/snapshot_list.py b/repos/snapshot/snapshot_list.py index e8ec686..2e4e653 100644 --- a/repos/snapshot/snapshot_list.py +++ b/repos/snapshot/snapshot_list.py @@ -14,17 +14,6 @@ import sys import re import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - SNAPSHOT_DIR = "/var/lib/libvirt/qemu/snapshot" SNAPSHOT_LIST = "virsh snapshot-list %s |sed -n '3,$'p|awk '{print $1}'" diff --git a/repos/storage/activate_pool.py b/repos/storage/activate_pool.py index 7070388..790a1f3 100644 --- a/repos/storage/activate_pool.py +++ b/repos/storage/activate_pool.py @@ -13,24 +13,12 @@ import re import sys import time -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils from utils.Python import xmlbuilder from exception import LibvirtAPI - def usage(params): """Verify inputing parameter dictionary""" logger = params['logger'] diff --git a/repos/storage/build_dir_pool.py b/repos/storage/build_dir_pool.py index a439a11..f8c6a3f 100644 --- a/repos/storage/build_dir_pool.py +++ b/repos/storage/build_dir_pool.py @@ -17,17 +17,6 @@ import sys import commands from xml.dom import minidom -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/build_disk_pool.py b/repos/storage/build_disk_pool.py index 2348a29..10ab2b6 100644 --- a/repos/storage/build_disk_pool.py +++ b/repos/storage/build_disk_pool.py @@ -18,17 +18,6 @@ import time import commands from xml.dom import minidom -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/build_logical_pool.py b/repos/storage/build_logical_pool.py index 77bc540..5e9bc0a 100644 --- a/repos/storage/build_logical_pool.py +++ b/repos/storage/build_logical_pool.py @@ -15,23 +15,11 @@ import re import sys import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils from exception import LibvirtAPI - def usage(params): """Verify inputing parameter dictionary""" keys = ['poolname'] diff --git a/repos/storage/build_netfs_pool.py b/repos/storage/build_netfs_pool.py index ea5d77d..b4beec7 100644 --- a/repos/storage/build_netfs_pool.py +++ b/repos/storage/build_netfs_pool.py @@ -15,23 +15,11 @@ import re import sys from xml.dom import minidom -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils from exception import LibvirtAPI - def usage(params): """Verify inputing parameter dictionary""" keys = ['poolname'] diff --git a/repos/storage/create_dir_pool.py b/repos/storage/create_dir_pool.py index c0d37ad..e13de5e 100644 --- a/repos/storage/create_dir_pool.py +++ b/repos/storage/create_dir_pool.py @@ -14,17 +14,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/create_dir_volume.py b/repos/storage/create_dir_volume.py index c6e3f8e..db2b5d2 100644 --- a/repos/storage/create_dir_volume.py +++ b/repos/storage/create_dir_volume.py @@ -17,17 +17,6 @@ import sys import commands from xml.dom import minidom -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/create_fs_pool.py b/repos/storage/create_fs_pool.py index 5dee6c1..ec40bc3 100644 --- a/repos/storage/create_fs_pool.py +++ b/repos/storage/create_fs_pool.py @@ -14,17 +14,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/create_iscsi_pool.py b/repos/storage/create_iscsi_pool.py index 16f7cfe..737bdd6 100644 --- a/repos/storage/create_iscsi_pool.py +++ b/repos/storage/create_iscsi_pool.py @@ -16,17 +16,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/create_logical_volume.py b/repos/storage/create_logical_volume.py index 0f5adfa..8cce18f 100644 --- a/repos/storage/create_logical_volume.py +++ b/repos/storage/create_logical_volume.py @@ -17,17 +17,6 @@ import sys import commands from xml.dom import minidom -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/create_netfs_pool.py b/repos/storage/create_netfs_pool.py index a53b59a..2dfc683 100644 --- a/repos/storage/create_netfs_pool.py +++ b/repos/storage/create_netfs_pool.py @@ -14,17 +14,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/create_netfs_volume.py b/repos/storage/create_netfs_volume.py index 49fb891..5edbe90 100644 --- a/repos/storage/create_netfs_volume.py +++ b/repos/storage/create_netfs_volume.py @@ -16,17 +16,6 @@ import sys import commands from xml.dom import minidom -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/create_partition_volume.py b/repos/storage/create_partition_volume.py index 3ababba..08e746e 100644 --- a/repos/storage/create_partition_volume.py +++ b/repos/storage/create_partition_volume.py @@ -16,17 +16,6 @@ import re import sys import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/define_dir_pool.py b/repos/storage/define_dir_pool.py index 189bc9a..e1e8a4e 100644 --- a/repos/storage/define_dir_pool.py +++ b/repos/storage/define_dir_pool.py @@ -16,17 +16,6 @@ import re import sys import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/define_disk_pool.py b/repos/storage/define_disk_pool.py index 56d54a0..f49130f 100644 --- a/repos/storage/define_disk_pool.py +++ b/repos/storage/define_disk_pool.py @@ -14,17 +14,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/define_iscsi_pool.py b/repos/storage/define_iscsi_pool.py index 05f0c45..93f4b7d 100644 --- a/repos/storage/define_iscsi_pool.py +++ b/repos/storage/define_iscsi_pool.py @@ -14,24 +14,12 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils from utils.Python import xmlbuilder from exception import LibvirtAPI - def usage(params): """Verify inputing parameter dictionary""" logger = params['logger'] diff --git a/repos/storage/define_logical_pool.py b/repos/storage/define_logical_pool.py index e0bfe34..0c0d96e 100644 --- a/repos/storage/define_logical_pool.py +++ b/repos/storage/define_logical_pool.py @@ -15,17 +15,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/define_mpath_pool.py b/repos/storage/define_mpath_pool.py index 14b2440..0360c4e 100644 --- a/repos/storage/define_mpath_pool.py +++ b/repos/storage/define_mpath_pool.py @@ -15,17 +15,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/define_netfs_pool.py b/repos/storage/define_netfs_pool.py index 8d7d94f..ce56b6f 100644 --- a/repos/storage/define_netfs_pool.py +++ b/repos/storage/define_netfs_pool.py @@ -15,24 +15,12 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils from utils.Python import xmlbuilder from exception import LibvirtAPI - def usage(params): """Verify inputing parameter dictionary""" logger = params['logger'] diff --git a/repos/storage/define_scsi_pool.py b/repos/storage/define_scsi_pool.py index 730c83a..cb8ef31 100644 --- a/repos/storage/define_scsi_pool.py +++ b/repos/storage/define_scsi_pool.py @@ -14,17 +14,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/delete_dir_volume.py b/repos/storage/delete_dir_volume.py index 8521341..a9aa316 100644 --- a/repos/storage/delete_dir_volume.py +++ b/repos/storage/delete_dir_volume.py @@ -15,23 +15,11 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils from exception import LibvirtAPI - def usage(params): """Verify inputing parameter dictionary""" keys = ['poolname', 'volname'] diff --git a/repos/storage/delete_logical_pool.py b/repos/storage/delete_logical_pool.py index da2447f..5ae2c74 100644 --- a/repos/storage/delete_logical_pool.py +++ b/repos/storage/delete_logical_pool.py @@ -15,23 +15,11 @@ import re import sys import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils from exception import LibvirtAPI - def usage(params): """Verify inputing parameter dictionary""" keys = ['poolname'] diff --git a/repos/storage/delete_logical_volume.py b/repos/storage/delete_logical_volume.py index 2d6e12f..6e2a88e 100644 --- a/repos/storage/delete_logical_volume.py +++ b/repos/storage/delete_logical_volume.py @@ -16,23 +16,11 @@ import re import sys import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils from exception import LibvirtAPI - def usage(params): """Verify inputing parameter dictionary""" # keys = ['poolname', 'volname', 'voltype', \ diff --git a/repos/storage/delete_netfs_volume.py b/repos/storage/delete_netfs_volume.py index 3470c5b..16dc50d 100644 --- a/repos/storage/delete_netfs_volume.py +++ b/repos/storage/delete_netfs_volume.py @@ -15,23 +15,11 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils from exception import LibvirtAPI - def usage(params): """Verify inputing parameter dictionary""" keys = ['poolname', 'volname'] diff --git a/repos/storage/delete_partition_volume.py b/repos/storage/delete_partition_volume.py index 40acb42..a84efdc 100644 --- a/repos/storage/delete_partition_volume.py +++ b/repos/storage/delete_partition_volume.py @@ -16,17 +16,6 @@ import re import sys import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/destroy_pool.py b/repos/storage/destroy_pool.py index 98d4535..f5bed22 100644 --- a/repos/storage/destroy_pool.py +++ b/repos/storage/destroy_pool.py @@ -15,17 +15,6 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/pool_name.py b/repos/storage/pool_name.py index eaed182..6829dad 100644 --- a/repos/storage/pool_name.py +++ b/repos/storage/pool_name.py @@ -15,17 +15,6 @@ import re import time import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/pool_uuid.py b/repos/storage/pool_uuid.py index ba2619d..1a5c998 100644 --- a/repos/storage/pool_uuid.py +++ b/repos/storage/pool_uuid.py @@ -15,17 +15,6 @@ import re import time import commands -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils diff --git a/repos/storage/undefine_pool.py b/repos/storage/undefine_pool.py index b26fa7c..2be8784 100644 --- a/repos/storage/undefine_pool.py +++ b/repos/storage/undefine_pool.py @@ -14,23 +14,11 @@ import os import re import sys -def append_path(path): - """Append root path of package""" - if path in sys.path: - pass - else: - sys.path.append(path) - -pwd = os.getcwd() -result = re.search('(.*)libvirt-test-API', pwd) -append_path(result.group(0)) - from lib import connectAPI from lib import storageAPI from utils.Python import utils from exception import LibvirtAPI - def usage(params): """Verify inputing parameter dictionary""" keys = ['poolname'] -- 1.7.7.5