[libvirt] [test-API PATCH 2/3] test-API: Replace utils.Python with utils
Osier Yang
jyang at redhat.com
Tue Apr 10 03:56:40 UTC 2012
for i in $(find . -type f -name "*.py"); do \
sed -i -e 's/utils\.Python/utils/g' $i; \
done
---
env_clear.py | 2 +-
generator.py | 6 +++---
libvirt-test-api.py | 2 +-
parser.py | 2 +-
repos/domain/attach_disk.py | 4 ++--
repos/domain/attach_interface.py | 4 ++--
repos/domain/autostart.py | 2 +-
repos/domain/balloon_memory.py | 4 ++--
repos/domain/blkstats.py | 2 +-
repos/domain/console_mutex.py | 2 +-
repos/domain/cpu_affinity.py | 2 +-
repos/domain/cpu_topology.py | 2 +-
repos/domain/create.py | 4 ++--
repos/domain/define.py | 4 ++--
repos/domain/destroy.py | 2 +-
repos/domain/detach_disk.py | 4 ++--
repos/domain/detach_interface.py | 4 ++--
repos/domain/domain_blkinfo.py | 2 +-
repos/domain/domain_id.py | 2 +-
repos/domain/domain_uuid.py | 2 +-
repos/domain/domblkinfo.py | 2 +-
repos/domain/dump.py | 4 ++--
repos/domain/eventhandler.py | 2 +-
repos/domain/ifstats.py | 2 +-
repos/domain/install_image.py | 6 +++---
repos/domain/install_linux_cdrom.py | 6 +++---
repos/domain/install_linux_check.py | 6 +++---
repos/domain/install_linux_net.py | 6 +++---
repos/domain/install_windows_cdrom.py | 6 +++---
repos/domain/migrate.py | 4 ++--
repos/domain/ownership_test.py | 2 +-
repos/domain/reboot.py | 2 +-
repos/domain/restore.py | 2 +-
repos/domain/resume.py | 2 +-
repos/domain/save.py | 2 +-
repos/domain/sched_params.py | 2 +-
repos/domain/shutdown.py | 2 +-
repos/domain/start.py | 2 +-
repos/domain/suspend.py | 2 +-
repos/domain/undefine.py | 2 +-
repos/domain/update_devflag.py | 4 ++--
repos/interface/create.py | 4 ++--
repos/interface/define.py | 4 ++--
repos/interface/destroy.py | 4 ++--
repos/interface/undefine.py | 4 ++--
repos/libvirtd/qemu_hang.py | 2 +-
repos/libvirtd/restart.py | 2 +-
repos/libvirtd/upstart.py | 2 +-
repos/network/autostart.py | 2 +-
repos/network/create.py | 4 ++--
repos/network/define.py | 4 ++--
repos/network/destroy.py | 2 +-
repos/network/network_list.py | 2 +-
repos/network/network_name.py | 2 +-
repos/network/network_uuid.py | 2 +-
repos/network/start.py | 2 +-
repos/network/undefine.py | 2 +-
repos/nodedevice/detach.py | 2 +-
repos/nodedevice/reattach.py | 2 +-
repos/nodedevice/reset.py | 2 +-
repos/npiv/create_virtual_hba.py | 4 ++--
.../multiple_thread_block_on_domain_create.py | 6 +++---
repos/remoteAccess/tcp_setup.py | 2 +-
repos/remoteAccess/tls_setup.py | 2 +-
repos/remoteAccess/unix_perm_sasl.py | 2 +-
repos/sVirt/domain_nfs_start.py | 2 +-
repos/snapshot/delete.py | 2 +-
repos/snapshot/file_flag.py | 4 ++--
repos/snapshot/flag_check.py | 4 ++--
repos/snapshot/internal_create.py | 4 ++--
repos/snapshot/revert.py | 2 +-
repos/storage/activate_pool.py | 4 ++--
repos/storage/build_dir_pool.py | 2 +-
repos/storage/build_disk_pool.py | 2 +-
repos/storage/build_logical_pool.py | 2 +-
repos/storage/build_netfs_pool.py | 2 +-
repos/storage/create_dir_pool.py | 4 ++--
repos/storage/create_dir_volume.py | 4 ++--
repos/storage/create_fs_pool.py | 6 +++---
repos/storage/create_iscsi_pool.py | 4 ++--
repos/storage/create_logical_volume.py | 4 ++--
repos/storage/create_netfs_pool.py | 6 +++---
repos/storage/create_netfs_volume.py | 4 ++--
repos/storage/create_partition_volume.py | 4 ++--
repos/storage/define_dir_pool.py | 4 ++--
repos/storage/define_disk_pool.py | 4 ++--
repos/storage/define_iscsi_pool.py | 4 ++--
repos/storage/define_logical_pool.py | 4 ++--
repos/storage/define_mpath_pool.py | 4 ++--
repos/storage/define_netfs_pool.py | 4 ++--
repos/storage/define_scsi_pool.py | 4 ++--
repos/storage/delete_dir_volume.py | 2 +-
repos/storage/delete_logical_pool.py | 2 +-
repos/storage/delete_logical_volume.py | 2 +-
repos/storage/delete_netfs_volume.py | 2 +-
repos/storage/delete_partition_volume.py | 4 ++--
repos/storage/destroy_pool.py | 4 ++--
repos/storage/pool_name.py | 2 +-
repos/storage/pool_uuid.py | 2 +-
repos/storage/undefine_pool.py | 2 +-
100 files changed, 154 insertions(+), 154 deletions(-)
diff --git a/env_clear.py b/env_clear.py
index 5e78ab5..3efc9be 100644
--- a/env_clear.py
+++ b/env_clear.py
@@ -18,7 +18,7 @@
#
import mapper
-from utils.Python import log
+from utils import log
class EnvClear(object):
""" Generate a callable class of executing clearing function in
diff --git a/generator.py b/generator.py
index 0af4227..320d9ac 100644
--- a/generator.py
+++ b/generator.py
@@ -23,9 +23,9 @@ import sys
import traceback
import mapper
-from utils.Python import log
-from utils.Python import format
-from utils.Python import env_parser
+from utils import log
+from utils import format
+from utils import env_parser
# Import of distribution-specific code. If this is needed somewhere
# else in the future, please don't copy-paste this, but create some
diff --git a/libvirt-test-api.py b/libvirt-test-api.py
index f399672..d4ce4f2 100644
--- a/libvirt-test-api.py
+++ b/libvirt-test-api.py
@@ -26,7 +26,7 @@ import proxy
import generator
import env_clear
import process
-from utils.Python import log
+from utils import log
from logxmlparser import LogXMLParser
def usage():
diff --git a/parser.py b/parser.py
index 4c4b6fa..f3ff9bf 100644
--- a/parser.py
+++ b/parser.py
@@ -23,7 +23,7 @@ import copy
import exception
import string
-from utils.Python import env_parser
+from utils import env_parser
class CaseFileParser(object):
""" Parser the case configuration file to generate a data list.
diff --git a/repos/domain/attach_disk.py b/repos/domain/attach_disk.py
index 720e3ff..7e0f94c 100644
--- a/repos/domain/attach_disk.py
+++ b/repos/domain/attach_disk.py
@@ -17,8 +17,8 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/domain/attach_interface.py b/repos/domain/attach_interface.py
index 76ae631..f5c8c26 100644
--- a/repos/domain/attach_interface.py
+++ b/repos/domain/attach_interface.py
@@ -14,8 +14,8 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/domain/autostart.py b/repos/domain/autostart.py
index 8265d4d..bdb85b9 100644
--- a/repos/domain/autostart.py
+++ b/repos/domain/autostart.py
@@ -12,7 +12,7 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/domain/balloon_memory.py b/repos/domain/balloon_memory.py
index d6bebd9..dea516b 100644
--- a/repos/domain/balloon_memory.py
+++ b/repos/domain/balloon_memory.py
@@ -15,8 +15,8 @@ from xml.dom import minidom
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import check
+from utils import utils
+from utils import check
def return_close(conn, logger, ret):
conn.close()
diff --git a/repos/domain/blkstats.py b/repos/domain/blkstats.py
index 89e001c..be587b4 100644
--- a/repos/domain/blkstats.py
+++ b/repos/domain/blkstats.py
@@ -12,7 +12,7 @@ import libxml2
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/domain/console_mutex.py b/repos/domain/console_mutex.py
index 50730e0..9ace047 100644
--- a/repos/domain/console_mutex.py
+++ b/repos/domain/console_mutex.py
@@ -6,7 +6,7 @@ import libvirt
from libvirt import libvirtError
from exception import TestError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify parameter dictionary"""
diff --git a/repos/domain/cpu_affinity.py b/repos/domain/cpu_affinity.py
index 67dc05a..bd7d907 100644
--- a/repos/domain/cpu_affinity.py
+++ b/repos/domain/cpu_affinity.py
@@ -16,7 +16,7 @@ from xml.dom import minidom
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def return_close(conn, logger, ret):
conn.close()
diff --git a/repos/domain/cpu_topology.py b/repos/domain/cpu_topology.py
index 33a3c5b..1bb57bc 100644
--- a/repos/domain/cpu_topology.py
+++ b/repos/domain/cpu_topology.py
@@ -24,7 +24,7 @@ from xml.dom import minidom
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def check_params(params):
"""check out the arguments requried for testing"""
diff --git a/repos/domain/create.py b/repos/domain/create.py
index ea7a0e6..975b152 100644
--- a/repos/domain/create.py
+++ b/repos/domain/create.py
@@ -24,8 +24,8 @@ import time
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
NONE = 0
START_PAUSED = 1
diff --git a/repos/domain/define.py b/repos/domain/define.py
index 71ba20c..de34544 100644
--- a/repos/domain/define.py
+++ b/repos/domain/define.py
@@ -26,8 +26,8 @@ import pexpect
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage():
print '''usage: mandatory arguments:guesttype
diff --git a/repos/domain/destroy.py b/repos/domain/destroy.py
index f5a5de0..2bd4793 100644
--- a/repos/domain/destroy.py
+++ b/repos/domain/destroy.py
@@ -11,7 +11,7 @@ import time
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def check_params(params):
"""Verify the input parameter"""
diff --git a/repos/domain/detach_disk.py b/repos/domain/detach_disk.py
index 9c10996..d894dc1 100644
--- a/repos/domain/detach_disk.py
+++ b/repos/domain/detach_disk.py
@@ -15,8 +15,8 @@ import time
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/domain/detach_interface.py b/repos/domain/detach_interface.py
index 852d393..91c2729 100644
--- a/repos/domain/detach_interface.py
+++ b/repos/domain/detach_interface.py
@@ -15,8 +15,8 @@ import time
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/domain/domain_blkinfo.py b/repos/domain/domain_blkinfo.py
index 4391a03..b320653 100644
--- a/repos/domain/domain_blkinfo.py
+++ b/repos/domain/domain_blkinfo.py
@@ -10,7 +10,7 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
GET_DOMBLKINFO_MAC = "virsh domblkinfo %s %s | awk '{print $2}'"
GET_CAPACITY = "du -b %s | awk '{print $1}'"
diff --git a/repos/domain/domain_id.py b/repos/domain/domain_id.py
index c492a37..c89eeaf 100644
--- a/repos/domain/domain_id.py
+++ b/repos/domain/domain_id.py
@@ -9,7 +9,7 @@ import commands
import libvirt
-from utils.Python import utils
+from utils import utils
VIRSH_DOMID = "virsh domid"
VIRSH_IDS = "virsh --quiet list |awk '{print $1}'"
diff --git a/repos/domain/domain_uuid.py b/repos/domain/domain_uuid.py
index f2dfa06..41f381b 100644
--- a/repos/domain/domain_uuid.py
+++ b/repos/domain/domain_uuid.py
@@ -10,7 +10,7 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
VIRSH_DOMUUID = "virsh domuuid"
diff --git a/repos/domain/domblkinfo.py b/repos/domain/domblkinfo.py
index 4391a03..b320653 100644
--- a/repos/domain/domblkinfo.py
+++ b/repos/domain/domblkinfo.py
@@ -10,7 +10,7 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
GET_DOMBLKINFO_MAC = "virsh domblkinfo %s %s | awk '{print $2}'"
GET_CAPACITY = "du -b %s | awk '{print $1}'"
diff --git a/repos/domain/dump.py b/repos/domain/dump.py
index 9ed5ab1..dcbc230 100644
--- a/repos/domain/dump.py
+++ b/repos/domain/dump.py
@@ -14,8 +14,8 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import check
+from utils import utils
+from utils import check
def return_close(conn, logger, ret):
conn.close()
diff --git a/repos/domain/eventhandler.py b/repos/domain/eventhandler.py
index f686b07..d01874a 100644
--- a/repos/domain/eventhandler.py
+++ b/repos/domain/eventhandler.py
@@ -15,7 +15,7 @@ import threading
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
LoopThread = None
looping = True
diff --git a/repos/domain/ifstats.py b/repos/domain/ifstats.py
index d8a627b..5bb85f7 100644
--- a/repos/domain/ifstats.py
+++ b/repos/domain/ifstats.py
@@ -13,7 +13,7 @@ import libxml2
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py
index 37b1290..0ef1e5e 100644
--- a/repos/domain/install_image.py
+++ b/repos/domain/install_image.py
@@ -24,9 +24,9 @@ import urllib
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import env_parser
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import env_parser
+from utils import xmlbuilder
HOME_PATH = os.getcwd()
diff --git a/repos/domain/install_linux_cdrom.py b/repos/domain/install_linux_cdrom.py
index 2a369a0..8976119 100644
--- a/repos/domain/install_linux_cdrom.py
+++ b/repos/domain/install_linux_cdrom.py
@@ -32,9 +32,9 @@ import urllib
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import env_parser
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import env_parser
+from utils import xmlbuilder
VIRSH_QUIET_LIST = "virsh --quiet list --all|awk '{print $2}'|grep \"^%s$\""
VM_STAT = "virsh --quiet list --all| grep \"\\b%s\\b\"|grep off"
diff --git a/repos/domain/install_linux_check.py b/repos/domain/install_linux_check.py
index 4bb7c8e..a014f9b 100644
--- a/repos/domain/install_linux_check.py
+++ b/repos/domain/install_linux_check.py
@@ -25,9 +25,9 @@ import math
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import check
-from utils.Python import env_parser
+from utils import utils
+from utils import check
+from utils import env_parser
HOME_PATH = os.getcwd()
diff --git a/repos/domain/install_linux_net.py b/repos/domain/install_linux_net.py
index de7a0a9..dbf6dc8 100644
--- a/repos/domain/install_linux_net.py
+++ b/repos/domain/install_linux_net.py
@@ -31,9 +31,9 @@ import urllib
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import env_parser
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import env_parser
+from utils import xmlbuilder
VIRSH_QUIET_LIST = "virsh --quiet list --all|awk '{print $2}'|grep \"^%s$\""
VM_STAT = "virsh --quiet list --all| grep \"\\b%s\\b\"|grep off"
diff --git a/repos/domain/install_windows_cdrom.py b/repos/domain/install_windows_cdrom.py
index 8ae6db8..150a43b 100644
--- a/repos/domain/install_windows_cdrom.py
+++ b/repos/domain/install_windows_cdrom.py
@@ -31,9 +31,9 @@ import shutil
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import env_parser
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import env_parser
+from utils import xmlbuilder
VIRSH_QUIET_LIST = "virsh --quiet list --all|awk '{print $2}'|grep \"^%s$\""
VM_STAT = "virsh --quiet list --all| grep \"\\b%s\\b\"|grep off"
diff --git a/repos/domain/migrate.py b/repos/domain/migrate.py
index fb6bdad..23a05a8 100644
--- a/repos/domain/migrate.py
+++ b/repos/domain/migrate.py
@@ -42,8 +42,8 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
SSH_KEYGEN = "ssh-keygen -t rsa"
SSH_COPY_ID = "ssh-copy-id"
diff --git a/repos/domain/ownership_test.py b/repos/domain/ownership_test.py
index c414d81..5651412 100644
--- a/repos/domain/ownership_test.py
+++ b/repos/domain/ownership_test.py
@@ -19,7 +19,7 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
QEMU_CONF = "/etc/libvirt/qemu.conf"
SAVE_FILE = "/mnt/test.save"
diff --git a/repos/domain/reboot.py b/repos/domain/reboot.py
index bf1c01d..382704d 100644
--- a/repos/domain/reboot.py
+++ b/repos/domain/reboot.py
@@ -12,7 +12,7 @@ import time
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def check_params(params_given):
"""Checking the arguments required"""
diff --git a/repos/domain/restore.py b/repos/domain/restore.py
index 4b7db1b..f2adb02 100644
--- a/repos/domain/restore.py
+++ b/repos/domain/restore.py
@@ -12,7 +12,7 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def return_close(conn, logger, ret):
conn.close()
diff --git a/repos/domain/resume.py b/repos/domain/resume.py
index 5539df2..dfd9569 100644
--- a/repos/domain/resume.py
+++ b/repos/domain/resume.py
@@ -10,7 +10,7 @@ import re
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def return_close(conn, logger, ret):
conn.close()
diff --git a/repos/domain/save.py b/repos/domain/save.py
index 7edcac4..e2512a8 100644
--- a/repos/domain/save.py
+++ b/repos/domain/save.py
@@ -12,7 +12,7 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/domain/sched_params.py b/repos/domain/sched_params.py
index 2ff0b5e..549c684 100644
--- a/repos/domain/sched_params.py
+++ b/repos/domain/sched_params.py
@@ -15,7 +15,7 @@ import commands
import libvirt
-from utils.Python import utils
+from utils import utils
def return_close(conn, logger, ret):
conn.close()
diff --git a/repos/domain/shutdown.py b/repos/domain/shutdown.py
index 812f319..a95ca82 100644
--- a/repos/domain/shutdown.py
+++ b/repos/domain/shutdown.py
@@ -11,7 +11,7 @@ import time
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def return_close(conn, logger, ret):
conn.close()
diff --git a/repos/domain/start.py b/repos/domain/start.py
index 654f3c3..7881787 100644
--- a/repos/domain/start.py
+++ b/repos/domain/start.py
@@ -12,7 +12,7 @@ import time
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
NONE = 0
START_PAUSED = 1
diff --git a/repos/domain/suspend.py b/repos/domain/suspend.py
index d71dde3..67fd5b7 100644
--- a/repos/domain/suspend.py
+++ b/repos/domain/suspend.py
@@ -11,7 +11,7 @@ import time
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def return_close(conn, logger, ret):
conn.close()
diff --git a/repos/domain/undefine.py b/repos/domain/undefine.py
index 075880d..bb188d2 100644
--- a/repos/domain/undefine.py
+++ b/repos/domain/undefine.py
@@ -11,7 +11,7 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/domain/update_devflag.py b/repos/domain/update_devflag.py
index 7755572..8a2a160 100644
--- a/repos/domain/update_devflag.py
+++ b/repos/domain/update_devflag.py
@@ -20,8 +20,8 @@ from xml.dom import minidom
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def check_params(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/interface/create.py b/repos/interface/create.py
index 9253278..0491986 100644
--- a/repos/interface/create.py
+++ b/repos/interface/create.py
@@ -11,8 +11,8 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/interface/define.py b/repos/interface/define.py
index 7fd6076..2e4512c 100644
--- a/repos/interface/define.py
+++ b/repos/interface/define.py
@@ -10,8 +10,8 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/interface/destroy.py b/repos/interface/destroy.py
index bd2cc30..fd6d078 100644
--- a/repos/interface/destroy.py
+++ b/repos/interface/destroy.py
@@ -11,8 +11,8 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/interface/undefine.py b/repos/interface/undefine.py
index ec8a321..517ea21 100644
--- a/repos/interface/undefine.py
+++ b/repos/interface/undefine.py
@@ -10,8 +10,8 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/libvirtd/qemu_hang.py b/repos/libvirtd/qemu_hang.py
index 6a41c50..4504640 100644
--- a/repos/libvirtd/qemu_hang.py
+++ b/repos/libvirtd/qemu_hang.py
@@ -14,7 +14,7 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
VIRSH_LIST = "virsh list --all"
RESTART_CMD = "service libvirtd restart"
diff --git a/repos/libvirtd/restart.py b/repos/libvirtd/restart.py
index 341fb27..81591f2 100644
--- a/repos/libvirtd/restart.py
+++ b/repos/libvirtd/restart.py
@@ -14,7 +14,7 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
VIRSH_LIST = "virsh list --all"
RESTART_CMD = "service libvirtd restart"
diff --git a/repos/libvirtd/upstart.py b/repos/libvirtd/upstart.py
index 45c91af..3fa9d2b 100644
--- a/repos/libvirtd/upstart.py
+++ b/repos/libvirtd/upstart.py
@@ -7,7 +7,7 @@ import re
import sys
import time
-from utils.Python import utils
+from utils import utils
from shutil import copy
VIRSH_LIST = "virsh list --all"
diff --git a/repos/network/autostart.py b/repos/network/autostart.py
index 77c84d2..02997da 100644
--- a/repos/network/autostart.py
+++ b/repos/network/autostart.py
@@ -12,7 +12,7 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def check_params(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/network/create.py b/repos/network/create.py
index 1733fe9..1bb0abe 100644
--- a/repos/network/create.py
+++ b/repos/network/create.py
@@ -11,8 +11,8 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/network/define.py b/repos/network/define.py
index 73a8f96..0b0d9a5 100644
--- a/repos/network/define.py
+++ b/repos/network/define.py
@@ -11,8 +11,8 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/network/destroy.py b/repos/network/destroy.py
index 37f86c5..32d95ae 100644
--- a/repos/network/destroy.py
+++ b/repos/network/destroy.py
@@ -9,7 +9,7 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/network/network_list.py b/repos/network/network_list.py
index a48ac29..67db632 100644
--- a/repos/network/network_list.py
+++ b/repos/network/network_list.py
@@ -10,7 +10,7 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
VIRSH_QUIET_NETLIST = "virsh --quiet net-list %s|awk '{print $1}'"
VIRSH_NETLIST = "virsh net-list %s"
diff --git a/repos/network/network_name.py b/repos/network/network_name.py
index 52b8189..b097348 100644
--- a/repos/network/network_name.py
+++ b/repos/network/network_name.py
@@ -10,7 +10,7 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
VIRSH_NETNAME = "virsh net-name"
diff --git a/repos/network/network_uuid.py b/repos/network/network_uuid.py
index 0375630..b5f9fcd 100644
--- a/repos/network/network_uuid.py
+++ b/repos/network/network_uuid.py
@@ -10,7 +10,7 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
VIRSH_NETUUID = "virsh net-uuid"
diff --git a/repos/network/start.py b/repos/network/start.py
index a9b5cdf..44243d2 100644
--- a/repos/network/start.py
+++ b/repos/network/start.py
@@ -12,7 +12,7 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def return_close(conn, logger, ret):
conn.close()
diff --git a/repos/network/undefine.py b/repos/network/undefine.py
index 0166ea1..a51aff5 100644
--- a/repos/network/undefine.py
+++ b/repos/network/undefine.py
@@ -11,7 +11,7 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/nodedevice/detach.py b/repos/nodedevice/detach.py
index fb49f10..8fdc60f 100644
--- a/repos/nodedevice/detach.py
+++ b/repos/nodedevice/detach.py
@@ -11,7 +11,7 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/nodedevice/reattach.py b/repos/nodedevice/reattach.py
index fe587b7..7fcd113 100644
--- a/repos/nodedevice/reattach.py
+++ b/repos/nodedevice/reattach.py
@@ -11,7 +11,7 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/nodedevice/reset.py b/repos/nodedevice/reset.py
index d6a8456..c5d953e 100644
--- a/repos/nodedevice/reset.py
+++ b/repos/nodedevice/reset.py
@@ -11,7 +11,7 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/npiv/create_virtual_hba.py b/repos/npiv/create_virtual_hba.py
index 2c398bb..50d2223 100644
--- a/repos/npiv/create_virtual_hba.py
+++ b/repos/npiv/create_virtual_hba.py
@@ -7,12 +7,12 @@ import sys
import re
import commands
import xml.dom.minidom
-from utils.Python import xmlbuilder
+from utils import xmlbuilder
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
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 49b49ed..5ea0fb8 100644
--- a/repos/regression/multiple_thread_block_on_domain_create.py
+++ b/repos/regression/multiple_thread_block_on_domain_create.py
@@ -14,9 +14,9 @@ from threading import Thread
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import env_parser
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import env_parser
+from utils import xmlbuilder
IMAG_PATH = "/var/lib/libvirt/images/"
DISK_DD = "dd if=/dev/zero of=%s bs=1 count=1 seek=6G"
diff --git a/repos/remoteAccess/tcp_setup.py b/repos/remoteAccess/tcp_setup.py
index bd667c4..792bf89 100644
--- a/repos/remoteAccess/tcp_setup.py
+++ b/repos/remoteAccess/tcp_setup.py
@@ -20,7 +20,7 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
SASLPASSWD2 = "/usr/sbin/saslpasswd2"
LIBVIRTD_CONF = "/etc/libvirt/libvirtd.conf"
diff --git a/repos/remoteAccess/tls_setup.py b/repos/remoteAccess/tls_setup.py
index d9f2901..b8bc540 100644
--- a/repos/remoteAccess/tls_setup.py
+++ b/repos/remoteAccess/tls_setup.py
@@ -27,7 +27,7 @@ import shutil
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
CERTTOOL = "/usr/bin/certtool"
CP = "/bin/cp"
diff --git a/repos/remoteAccess/unix_perm_sasl.py b/repos/remoteAccess/unix_perm_sasl.py
index a61b35f..d34ced3 100644
--- a/repos/remoteAccess/unix_perm_sasl.py
+++ b/repos/remoteAccess/unix_perm_sasl.py
@@ -18,7 +18,7 @@ from pwd import getpwnam
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
TESTING_USER = 'testapi'
LIBVIRTD_CONF = "/etc/libvirt/libvirtd.conf"
diff --git a/repos/sVirt/domain_nfs_start.py b/repos/sVirt/domain_nfs_start.py
index 0dc61dc..10cca44 100644
--- a/repos/sVirt/domain_nfs_start.py
+++ b/repos/sVirt/domain_nfs_start.py
@@ -23,7 +23,7 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
from shutil import copy
QEMU_CONF = "/etc/libvirt/qemu.conf"
diff --git a/repos/snapshot/delete.py b/repos/snapshot/delete.py
index 4959bfd..4148d77 100644
--- a/repos/snapshot/delete.py
+++ b/repos/snapshot/delete.py
@@ -10,7 +10,7 @@ import re
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
SNAPSHOT_DIR = "/var/lib/libvirt/qemu/snapshot"
diff --git a/repos/snapshot/file_flag.py b/repos/snapshot/file_flag.py
index 01d3530..9506ab2 100644
--- a/repos/snapshot/file_flag.py
+++ b/repos/snapshot/file_flag.py
@@ -11,8 +11,8 @@ import time
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import check
+from utils import utils
+from utils import check
FLAG_FILE = "snapshot_flag"
MAKE_FLAG = "rm -f /tmp/%s; touch /tmp/%s " % (FLAG_FILE, FLAG_FILE)
diff --git a/repos/snapshot/flag_check.py b/repos/snapshot/flag_check.py
index eb9e48e..dcd7658 100644
--- a/repos/snapshot/flag_check.py
+++ b/repos/snapshot/flag_check.py
@@ -11,8 +11,8 @@ import time
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import check
+from utils import utils
+from utils import check
FLAG_FILE = "/tmp/snapshot_flag"
FLAG_CHECK = "ls %s" % FLAG_FILE
diff --git a/repos/snapshot/internal_create.py b/repos/snapshot/internal_create.py
index 8f7e1da..757c9f3 100644
--- a/repos/snapshot/internal_create.py
+++ b/repos/snapshot/internal_create.py
@@ -12,8 +12,8 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
QEMU_IMAGE_FORMAT = "qemu-img info %s |grep format |awk -F': ' '{print $2}'"
diff --git a/repos/snapshot/revert.py b/repos/snapshot/revert.py
index 22f62af..985bdb0 100644
--- a/repos/snapshot/revert.py
+++ b/repos/snapshot/revert.py
@@ -10,7 +10,7 @@ import re
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def check_params(params):
"""Verify the input parameter"""
diff --git a/repos/storage/activate_pool.py b/repos/storage/activate_pool.py
index 358ed11..665a3d0 100644
--- a/repos/storage/activate_pool.py
+++ b/repos/storage/activate_pool.py
@@ -9,8 +9,8 @@ import time
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/storage/build_dir_pool.py b/repos/storage/build_dir_pool.py
index 0eee57b..10d3e1b 100644
--- a/repos/storage/build_dir_pool.py
+++ b/repos/storage/build_dir_pool.py
@@ -12,7 +12,7 @@ from xml.dom import minidom
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/storage/build_disk_pool.py b/repos/storage/build_disk_pool.py
index 07e4fcb..20884a8 100644
--- a/repos/storage/build_disk_pool.py
+++ b/repos/storage/build_disk_pool.py
@@ -13,7 +13,7 @@ from xml.dom import minidom
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage():
"""usage information"""
diff --git a/repos/storage/build_logical_pool.py b/repos/storage/build_logical_pool.py
index d125dba..78310ef 100644
--- a/repos/storage/build_logical_pool.py
+++ b/repos/storage/build_logical_pool.py
@@ -11,7 +11,7 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/storage/build_netfs_pool.py b/repos/storage/build_netfs_pool.py
index 1f2cbbd..dfc3130 100644
--- a/repos/storage/build_netfs_pool.py
+++ b/repos/storage/build_netfs_pool.py
@@ -11,7 +11,7 @@ from xml.dom import minidom
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/storage/create_dir_pool.py b/repos/storage/create_dir_pool.py
index 55e1140..f5ae4ce 100644
--- a/repos/storage/create_dir_pool.py
+++ b/repos/storage/create_dir_pool.py
@@ -11,8 +11,8 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
""" Verifies the params dictionary for the required arguments """
diff --git a/repos/storage/create_dir_volume.py b/repos/storage/create_dir_volume.py
index 5c3e69b..6dd973e 100644
--- a/repos/storage/create_dir_volume.py
+++ b/repos/storage/create_dir_volume.py
@@ -12,8 +12,8 @@ from xml.dom import minidom
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage():
"""usage infomation"""
diff --git a/repos/storage/create_fs_pool.py b/repos/storage/create_fs_pool.py
index 7557a1d..8114dba 100644
--- a/repos/storage/create_fs_pool.py
+++ b/repos/storage/create_fs_pool.py
@@ -11,9 +11,9 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
-from utils.Python import XMLParser
+from utils import utils
+from utils import xmlbuilder
+from utils import XMLParser
def usage(params):
""" Verifies the params dictionary for the required arguments """
diff --git a/repos/storage/create_iscsi_pool.py b/repos/storage/create_iscsi_pool.py
index df768a3..76181ff 100644
--- a/repos/storage/create_iscsi_pool.py
+++ b/repos/storage/create_iscsi_pool.py
@@ -11,8 +11,8 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
""" Verifies the params dictionary for the required arguments """
diff --git a/repos/storage/create_logical_volume.py b/repos/storage/create_logical_volume.py
index 1dc7dfb..62e513c 100644
--- a/repos/storage/create_logical_volume.py
+++ b/repos/storage/create_logical_volume.py
@@ -12,8 +12,8 @@ from xml.dom import minidom
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/storage/create_netfs_pool.py b/repos/storage/create_netfs_pool.py
index e98d4fa..bbbc838 100644
--- a/repos/storage/create_netfs_pool.py
+++ b/repos/storage/create_netfs_pool.py
@@ -11,9 +11,9 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
-from utils.Python import XMLParser
+from utils import utils
+from utils import xmlbuilder
+from utils import XMLParser
def usage(params):
"""
diff --git a/repos/storage/create_netfs_volume.py b/repos/storage/create_netfs_volume.py
index d402a65..4bbe394 100644
--- a/repos/storage/create_netfs_volume.py
+++ b/repos/storage/create_netfs_volume.py
@@ -12,8 +12,8 @@ from xml.dom import minidom
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage():
"""usage infomation"""
diff --git a/repos/storage/create_partition_volume.py b/repos/storage/create_partition_volume.py
index 204b235..f8d8c62 100644
--- a/repos/storage/create_partition_volume.py
+++ b/repos/storage/create_partition_volume.py
@@ -11,8 +11,8 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage():
"""usage infomation"""
diff --git a/repos/storage/define_dir_pool.py b/repos/storage/define_dir_pool.py
index 1c852b0..cd1997e 100644
--- a/repos/storage/define_dir_pool.py
+++ b/repos/storage/define_dir_pool.py
@@ -11,8 +11,8 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
VIRSH_POOLLIST = "virsh --quiet pool-list --all|awk '{print $1}'|grep \"^%s$\""
POOL_STAT = "virsh --quiet pool-list --all|grep \"^%s\\b\" |grep \"inactive\""
diff --git a/repos/storage/define_disk_pool.py b/repos/storage/define_disk_pool.py
index 3d594b7..1a25e90 100644
--- a/repos/storage/define_disk_pool.py
+++ b/repos/storage/define_disk_pool.py
@@ -10,8 +10,8 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage():
"usage infomation"
diff --git a/repos/storage/define_iscsi_pool.py b/repos/storage/define_iscsi_pool.py
index 0659126..8372a31 100644
--- a/repos/storage/define_iscsi_pool.py
+++ b/repos/storage/define_iscsi_pool.py
@@ -10,8 +10,8 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/storage/define_logical_pool.py b/repos/storage/define_logical_pool.py
index eaa6f5b..bd9f676 100644
--- a/repos/storage/define_logical_pool.py
+++ b/repos/storage/define_logical_pool.py
@@ -10,8 +10,8 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/storage/define_mpath_pool.py b/repos/storage/define_mpath_pool.py
index 9b6fd95..d5d81b1 100644
--- a/repos/storage/define_mpath_pool.py
+++ b/repos/storage/define_mpath_pool.py
@@ -10,8 +10,8 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage():
"usage infomation"
diff --git a/repos/storage/define_netfs_pool.py b/repos/storage/define_netfs_pool.py
index 570cab7..372194d 100644
--- a/repos/storage/define_netfs_pool.py
+++ b/repos/storage/define_netfs_pool.py
@@ -10,8 +10,8 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/storage/define_scsi_pool.py b/repos/storage/define_scsi_pool.py
index 14fa77c..834f5a0 100644
--- a/repos/storage/define_scsi_pool.py
+++ b/repos/storage/define_scsi_pool.py
@@ -10,8 +10,8 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage():
"usage infomation"
diff --git a/repos/storage/delete_dir_volume.py b/repos/storage/delete_dir_volume.py
index 1ed14fc..b961f61 100644
--- a/repos/storage/delete_dir_volume.py
+++ b/repos/storage/delete_dir_volume.py
@@ -10,7 +10,7 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/storage/delete_logical_pool.py b/repos/storage/delete_logical_pool.py
index a58d3fd..9c581fb 100644
--- a/repos/storage/delete_logical_pool.py
+++ b/repos/storage/delete_logical_pool.py
@@ -11,7 +11,7 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/storage/delete_logical_volume.py b/repos/storage/delete_logical_volume.py
index 8907ce9..cd30bac 100644
--- a/repos/storage/delete_logical_volume.py
+++ b/repos/storage/delete_logical_volume.py
@@ -11,7 +11,7 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/storage/delete_netfs_volume.py b/repos/storage/delete_netfs_volume.py
index 2a9af10..f893c94 100644
--- a/repos/storage/delete_netfs_volume.py
+++ b/repos/storage/delete_netfs_volume.py
@@ -10,7 +10,7 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
diff --git a/repos/storage/delete_partition_volume.py b/repos/storage/delete_partition_volume.py
index 22a5e89..3d01346 100644
--- a/repos/storage/delete_partition_volume.py
+++ b/repos/storage/delete_partition_volume.py
@@ -11,8 +11,8 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def usage():
"""usage infomation"""
diff --git a/repos/storage/destroy_pool.py b/repos/storage/destroy_pool.py
index 5005b68..c5797ee 100644
--- a/repos/storage/destroy_pool.py
+++ b/repos/storage/destroy_pool.py
@@ -12,8 +12,8 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
-from utils.Python import xmlbuilder
+from utils import utils
+from utils import xmlbuilder
def return_close(conn, logger, ret):
conn.close()
diff --git a/repos/storage/pool_name.py b/repos/storage/pool_name.py
index 9bd3509..cf266de 100644
--- a/repos/storage/pool_name.py
+++ b/repos/storage/pool_name.py
@@ -11,7 +11,7 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
VIRSH_POOLNAME = "virsh pool-name"
diff --git a/repos/storage/pool_uuid.py b/repos/storage/pool_uuid.py
index d4342b1..796b842 100644
--- a/repos/storage/pool_uuid.py
+++ b/repos/storage/pool_uuid.py
@@ -11,7 +11,7 @@ import commands
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
VIRSH_POOLUUID = "virsh pool-uuid"
diff --git a/repos/storage/undefine_pool.py b/repos/storage/undefine_pool.py
index 8ec4aee..5e8e141 100644
--- a/repos/storage/undefine_pool.py
+++ b/repos/storage/undefine_pool.py
@@ -10,7 +10,7 @@ import sys
import libvirt
from libvirt import libvirtError
-from utils.Python import utils
+from utils import utils
def usage(params):
"""Verify inputing parameter dictionary"""
--
1.7.7.5
More information about the libvir-list
mailing list