9:25 p.m.
The TODO in round 2 is still not done, but let's get these
cleanups reviewed first.
Osier Yang (14):
Change libvirt-test-api to be executable
Remove NEWS and TODO
Destroy utils/check.py and move the functions into utils/utils.py
Move directory dist to src
Move utils/env_parser.py into src
Improve the comments telling what the scripts does for utils/*.py
Improve more comments to tell what the program does
Remove trainling blank lines for utils/*.sh
Use bash as the interpreter explicitly
Substitute 'guesttype' with 'virt_type'
Update AUTHORS
Rename utils/*.py with consistent naming style
Rename src/logxmlparser.py as src/log_generator.py
Rename 'env.cfg' as 'global.cfg'
AUTHORS | 17 +-
TODO | 4 -
cases/consumption_cpu_topology.conf | 2 +-
cases/consumption_domain_nfs_start.conf | 2 +-
cases/consumption_eventhandler.conf | 2 +-
cases/consumption_libvirtd.conf | 2 +-
cases/consumption_ownership_test.conf | 2 +-
cases/domain_linux_net_inst.conf | 4 +-
cases/linux_domain.conf | 10 +-
cases/migration/ssh_persistent_paused_no_dst.conf | 24 +-
.../migration/ssh_persistent_paused_with_dst.conf | 48 ++--
cases/migration/ssh_persistent_running_no_dst.conf | 24 +-
.../migration/ssh_persistent_running_with_dst.conf | 48 ++--
cases/migration/ssh_transient_paused_no_dst.conf | 22 +-
cases/migration/ssh_transient_paused_with_dst.conf | 48 ++--
cases/migration/ssh_transient_running_no_dst.conf | 24 +-
.../migration/ssh_transient_running_with_dst.conf | 48 ++--
cases/migration/tcp_persistent_paused_no_dst.conf | 24 +-
.../migration/tcp_persistent_paused_with_dst.conf | 48 ++--
cases/migration/tcp_persistent_running_no_dst.conf | 24 +-
.../migration/tcp_persistent_running_with_dst.conf | 48 ++--
.../tcp_sasl_persistent_paused_no_dst.conf | 8 +-
.../tcp_sasl_persistent_paused_with_dst.conf | 16 +-
.../tcp_sasl_persistent_running_no_dst.conf | 8 +-
.../tcp_sasl_persistent_running_with_dst.conf | 16 +-
.../tcp_sasl_transient_paused_no_dst.conf | 8 +-
.../tcp_sasl_transient_paused_with_dst.conf | 16 +-
.../tcp_sasl_transient_running_no_dst.conf | 8 +-
.../tcp_sasl_transient_running_with_dst.conf | 16 +-
cases/migration/tcp_transient_paused_no_dst.conf | 22 +-
cases/migration/tcp_transient_paused_with_dst.conf | 48 ++--
cases/migration/tcp_transient_running_no_dst.conf | 24 +-
.../migration/tcp_transient_running_with_dst.conf | 48 ++--
cases/migration/tls_persistent_paused_no_dst.conf | 24 +-
.../migration/tls_persistent_paused_with_dst.conf | 48 ++--
cases/migration/tls_persistent_running_no_dst.conf | 24 +-
.../migration/tls_persistent_running_with_dst.conf | 48 ++--
.../tls_sasl_persistent_paused_no_dst.conf | 8 +-
.../tls_sasl_persistent_paused_with_dst.conf | 16 +-
.../tls_sasl_persistent_running_no_dst.conf | 8 +-
.../tls_sasl_persistent_running_with_dst.conf | 16 +-
.../tls_sasl_transient_paused_no_dst.conf | 8 +-
.../tls_sasl_transient_paused_with_dst.conf | 16 +-
.../tls_sasl_transient_running_no_dst.conf | 8 +-
.../tls_sasl_transient_running_with_dst.conf | 16 +-
cases/migration/tls_transient_paused_no_dst.conf | 22 +-
cases/migration/tls_transient_paused_with_dst.conf | 48 ++--
cases/migration/tls_transient_running_no_dst.conf | 24 +-
.../migration/tls_transient_running_with_dst.conf | 48 ++--
cases/snapshot.conf | 2 +-
cases/windows_domain.conf | 8 +-
.../en-US/Understanding_libvirt-test-API.xml | 4 +-
.../en-US/Writing_a_test_case.xml | 10 +-
env.cfg => global.cfg | 0
libvirt-test-api | 24 +-
repos/domain/attach_disk.py | 6 +-
repos/domain/attach_interface.py | 4 +-
repos/domain/balloon_memory.py | 2 +-
repos/domain/create.py | 6 +-
repos/domain/define.py | 18 +-
repos/domain/detach_disk.py | 6 +-
repos/domain/detach_interface.py | 4 +-
repos/domain/dump.py | 2 +-
repos/domain/install_image.py | 14 +-
repos/domain/install_linux_cdrom.py | 28 +-
repos/domain/install_linux_check.py | 27 +-
repos/domain/install_linux_net.py | 32 +-
repos/domain/install_windows_cdrom.py | 22 +-
repos/domain/migrate.py | 2 +-
repos/domain/update_devflag.py | 8 +-
repos/interface/create.py | 2 +-
repos/interface/define.py | 4 +-
repos/interface/destroy.py | 2 +-
repos/interface/undefine.py | 2 +-
repos/network/create.py | 4 +-
repos/network/define.py | 4 +-
repos/npiv/create_virtual_hba.py | 4 +-
.../multiple_thread_block_on_domain_create.py | 12 +-
repos/snapshot/file_flag.py | 3 +-
repos/snapshot/flag_check.py | 3 +-
repos/snapshot/internal_create.py | 4 +-
repos/storage/activate_pool.py | 2 +-
repos/storage/create_dir_pool.py | 4 +-
repos/storage/create_dir_volume.py | 4 +-
repos/storage/create_fs_pool.py | 8 +-
repos/storage/create_iscsi_pool.py | 4 +-
repos/storage/create_logical_volume.py | 4 +-
repos/storage/create_netfs_pool.py | 8 +-
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_partition_volume.py | 2 +-
repos/storage/destroy_pool.py | 2 +-
{dist => src/dist}/__init__.py | 0
{dist => src/dist}/redhat/__init__.py | 0
{dist => src/dist}/redhat/env_inspect.py | 5 +-
{utils => src}/env_parser.py | 6 +-
src/exception.py | 9 +-
src/generator.py | 8 +-
src/{logxmlparser.py => log_generator.py} | 9 +-
src/parser.py | 6 +-
src/process.py | 7 +-
utils/check.py | 392 --------------------
utils/dev_num.sh | 5 +-
utils/disk_num.sh | 5 +-
utils/format.py | 6 +-
utils/ipget.sh | 2 +-
utils/log.py | 6 +-
utils/utils.py | 362 ++++++++++++++++++
utils/{xmlbuilder.py => xml_builder.py} | 62 ++--
utils/{xmlgenerator.py => xml_generator.py} | 70 ++--
utils/{XMLParser.py => xml_parser.py} | 13 +-
118 files changed, 1175 insertions(+), 1240 deletions(-)
delete mode 100644 NEWS
delete mode 100644 TODO
rename env.cfg => global.cfg (100%)
mode change 100644 => 100755 libvirt-test-api
rename {dist => src/dist}/__init__.py (100%)
rename {dist => src/dist}/redhat/__init__.py (100%)
rename {dist => src/dist}/redhat/env_inspect.py (97%)
rename {utils => src}/env_parser.py (96%)
rename src/{logxmlparser.py => log_generator.py} (97%)
delete mode 100644 utils/check.py
rename utils/{xmlbuilder.py => xml_builder.py} (88%)
rename utils/{xmlgenerator.py => xml_generator.py} (95%)
rename utils/{XMLParser.py => xml_parser.py} (95%)
Regards,
Osier
--
1.7.7.3
9:25 p.m.
New subject: [libvirt] [test-API 01/14] Change libvirt-test-api to be executable
And remove the redundant "python" in usage string.
---
libvirt-test-api | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
mode change 100644 => 100755 libvirt-test-api
diff --git a/libvirt-test-api b/libvirt-test-api
old mode 100644
new mode 100755
index 373e5c6..7eaaf21
--- a/libvirt-test-api
+++ b/libvirt-test-api
@@ -46,14 +46,14 @@ def usage():
print "example: \
- \n python libvirt-test-api -l 0|1 -c TEST.CONF \
- \n python libvirt-test-api -c TEST.CONF -f TEST.XML \
- \n python libvirt-test-api -t repos/domain/start.py ... \
- \n python libvirt-test-api -m TESTONE.XML TESTTWO.XML \
- \n python libvirt-test-api -d TEST.XML TESTRUNID TESTID \
- \n python libvirt-test-api -d TEST.XML TESTRUNID \
- \n python libvirt-test-api -d TEST.XML all \
- \n python libvirt-test-api -f TEST.XML \
+ \n libvirt-test-api -l 0|1 -c TEST.CONF \
+ \n libvirt-test-api -c TEST.CONF -f TEST.XML \
+ \n libvirt-test-api -t repos/domain/start.py ... \
+ \n libvirt-test-api -m TESTONE.XML TESTTWO.XML \
+ \n libvirt-test-api -d TEST.XML TESTRUNID TESTID \
+ \n libvirt-test-api -d TEST.XML TESTRUNID \
+ \n libvirt-test-api -d TEST.XML all \
+ \n libvirt-test-api -f TEST.XML \
-r TESTRUNID TESTID ..."
def append_path():
--
1.7.7.3
4:32 a.m.
New subject: [libvirt] [test-API 01/14] Change libvirt-test-api to be executable
On 04/19/2012 10:25 AM, Osier Yang wrote:
And remove the redundant "python" in usage string.
---
libvirt-test-api | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
mode change 100644 => 100755 libvirt-test-api
diff --git a/libvirt-test-api b/libvirt-test-api
old mode 100644
new mode 100755
index 373e5c6..7eaaf21
--- a/libvirt-test-api
+++ b/libvirt-test-api
@@ -46,14 +46,14 @@ def usage():
print "example: \
- \n python libvirt-test-api -l 0|1 -c TEST.CONF \
- \n python libvirt-test-api -c TEST.CONF -f TEST.XML \
- \n python libvirt-test-api -t repos/domain/start.py ... \
- \n python libvirt-test-api -m TESTONE.XML TESTTWO.XML \
- \n python libvirt-test-api -d TEST.XML TESTRUNID TESTID \
- \n python libvirt-test-api -d TEST.XML TESTRUNID \
- \n python libvirt-test-api -d TEST.XML all \
- \n python libvirt-test-api -f TEST.XML \
+ \n libvirt-test-api -l 0|1 -c TEST.CONF \
+ \n libvirt-test-api -c TEST.CONF -f TEST.XML \
+ \n libvirt-test-api -t repos/domain/start.py ... \
+ \n libvirt-test-api -m TESTONE.XML TESTTWO.XML \
+ \n libvirt-test-api -d TEST.XML TESTRUNID TESTID \
+ \n libvirt-test-api -d TEST.XML TESTRUNID \
+ \n libvirt-test-api -d TEST.XML all \
+ \n libvirt-test-api -f TEST.XML \
-r TESTRUNID TESTID ..."
def append_path():
ACK
Guannan Ren
9:25 p.m.
New subject: [libvirt] [test-API 02/14] Remove NEWS and TODO
We don't have a release cycle, and seems we will never update
TODO
---
TODO | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
delete mode 100644 NEWS
delete mode 100644 TODO
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
diff --git a/TODO b/TODO
deleted file mode 100644
index 6803754..0000000
--- a/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-
-- Refine the comments and coding style.
-
-- There are redundant codes, need to optimize, e.g. proxy.py
--
1.7.7.3
4:33 a.m.
New subject: [libvirt] [test-API 02/14] Remove NEWS and TODO
On 04/19/2012 10:25 AM, Osier Yang wrote:
We don't have a release cycle, and seems we will never update
TODO
---
TODO | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
delete mode 100644 NEWS
delete mode 100644 TODO
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
diff --git a/TODO b/TODO
deleted file mode 100644
index 6803754..0000000
--- a/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-
-- Refine the comments and coding style.
-
-- There are redundant codes, need to optimize, e.g. proxy.py
really? I have a plan!!
But I don't tell you.
ACK
Guannan Ren
4:30 a.m.
New subject: [libvirt] [test-API 02/14] Remove NEWS and TODO
On 2012年04月19日 17:33, Guannan Ren wrote:
On 04/19/2012 10:25 AM, Osier Yang wrote:
> We don't have a release cycle, and seems we will never update
> TODO
> ---
> TODO | 4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
> delete mode 100644 NEWS
> delete mode 100644 TODO
>
> diff --git a/NEWS b/NEWS
> deleted file mode 100644
> index e69de29..0000000
> diff --git a/TODO b/TODO
> deleted file mode 100644
> index 6803754..0000000
> --- a/TODO
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -
> -- Refine the comments and coding style.
> -
> -- There are redundant codes, need to optimize, e.g. proxy.py
really? I have a plan!!
But I don't tell you.
Well, it's the words hundrends of years ago. :-)
ACK
Guannan Ren
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
9:25 p.m.
New subject: [libvirt] [test-API 03/14] Destroy utils/check.py and move the functions into utils/utils.py
Scripts which use 'check.py' are updated to use "utils.py".
---
repos/domain/balloon_memory.py | 2 +-
repos/domain/dump.py | 2 +-
repos/domain/install_linux_check.py | 15 +-
repos/snapshot/file_flag.py | 3 +-
repos/snapshot/flag_check.py | 3 +-
utils/check.py | 392 -----------------------------------
utils/utils.py | 362 ++++++++++++++++++++++++++++++++
7 files changed, 373 insertions(+), 406 deletions(-)
delete mode 100644 utils/check.py
diff --git a/repos/domain/balloon_memory.py b/repos/domain/balloon_memory.py
index f5beae4..fc7383c 100644
--- a/repos/domain/balloon_memory.py
+++ b/repos/domain/balloon_memory.py
@@ -23,7 +23,7 @@ def get_mem_size(ip):
username = 'root'
password = 'redhat'
- current_memory = check.get_remote_memory(ip, username, password)
+ current_memory = utils.get_remote_memory(ip, username, password)
return current_memory
def compare_memory(expect_memory, actual_memory):
diff --git a/repos/domain/dump.py b/repos/domain/dump.py
index 60c5a91..24b2353 100644
--- a/repos/domain/dump.py
+++ b/repos/domain/dump.py
@@ -45,7 +45,7 @@ def check_guest_kernel(*args):
logger.debug("guest ip address: %s" %ipaddr)
- kernel = check.get_remote_kernel(ipaddr, "root", "redhat")
+ kernel = utils.get_remote_kernel(ipaddr, "root", "redhat")
logger.debug("current kernel version: %s" %kernel)
if kernel:
diff --git a/repos/domain/install_linux_check.py b/repos/domain/install_linux_check.py
index c6d2cb3..7a5a9ac 100644
--- a/repos/domain/install_linux_check.py
+++ b/repos/domain/install_linux_check.py
@@ -13,7 +13,6 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import check
from utils import env_parser
required_params = ('guestname', 'guesttype', 'hdmodel',
'nicmodel',)
@@ -95,9 +94,9 @@ def install_linux_check(params):
# Creat file and read file in guest.
logger.info("check point2: creat and read dirctory/file in guest")
- if check.create_dir(ipaddr, "root", "redhat") == 0:
+ if utils.create_dir(ipaddr, "root", "redhat") == 0:
logger.info("create dir - /tmp/test successfully")
- if check.write_file(ipaddr, "root", "redhat") == 0:
+ if utils.write_file(ipaddr, "root", "redhat") == 0:
logger.info("write and read file: /tmp/test/test.log
successfully")
else:
logger.error("Error: fail to write/read file -
/tmp/test/test.log")
@@ -114,7 +113,7 @@ def install_linux_check(params):
vcpunum_expect = int(utils.get_num_vcpus(domain_name))
logger.info("vcpu number in domain config xml - %s is %s" % \
(domain_name, vcpunum_expect))
- vcpunum_actual = int(check.get_remote_vcpus(ipaddr, "root",
"redhat"))
+ vcpunum_actual = int(utils.get_remote_vcpus(ipaddr, "root",
"redhat"))
logger.info("The actual vcpu number in guest - %s is %s" %
(domain_name, vcpunum_actual))
if vcpunum_expect == vcpunum_actual:
@@ -132,7 +131,7 @@ def install_linux_check(params):
mem_expect = utils.get_size_mem(domain_name)
logger.info("current mem size in domain config xml - %s is %s" %
(domain_name, mem_expect))
- mem_actual = check.get_remote_memory(ipaddr, "root", "redhat")
+ mem_actual = utils.get_remote_memory(ipaddr, "root", "redhat")
logger.info("The actual mem size in guest - %s is %s" %
(domain_name, mem_actual))
diff_range = int(mem_expect) * 0.07
@@ -155,7 +154,7 @@ def install_linux_check(params):
envparser = env_parser.Envparser(envfile)
file_url = envparser.get_value("other", "wget_url")
- if check.run_wget_app(ipaddr, "root", "redhat", file_url, logger)
== 0:
+ if utils.run_wget_app(ipaddr, "root", "redhat", file_url, logger)
== 0:
logger.info("run wget successfully in guest.")
else:
logger.error("Error: fail to run wget in guest")
@@ -166,9 +165,9 @@ def install_linux_check(params):
if 'kvm' in guesttype or 'xenfv' in guesttype:
logger.info("check point6: check nic and blk driver in guest is \
expected as your config:")
- if check.validate_remote_nic_type(ipaddr, "root", "redhat",
+ if utils.validate_remote_nic_type(ipaddr, "root", "redhat",
nic_type, logger) == 0 and \
- check.validate_remote_blk_type(ipaddr, "root", "redhat",
+ utils.validate_remote_blk_type(ipaddr, "root", "redhat",
blk_type, logger) == 0:
logger.info("nic type - %s and blk type - %s check successfully" %
(nic_type, blk_type))
diff --git a/repos/snapshot/file_flag.py b/repos/snapshot/file_flag.py
index 9f1c181..5f8a17e 100644
--- a/repos/snapshot/file_flag.py
+++ b/repos/snapshot/file_flag.py
@@ -11,7 +11,6 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import check
required_params = ('guestname', 'username', 'password',)
optional_params = ()
@@ -35,7 +34,7 @@ def check_domain_running(conn, guestname, logger):
def make_flag(ipaddr, username, password, logger):
""" enter guest OS, create a file in /tmp folder """
- ret = check.remote_exec_pexpect(ipaddr, username, password, MAKE_FLAG)
+ ret = utils.remote_exec_pexpect(ipaddr, username, password, MAKE_FLAG)
if ret == "TIMEOUT!!!":
logger.error("connecting to guest OS timeout")
return False
diff --git a/repos/snapshot/flag_check.py b/repos/snapshot/flag_check.py
index 9386e2b..3a0f3ec 100644
--- a/repos/snapshot/flag_check.py
+++ b/repos/snapshot/flag_check.py
@@ -10,7 +10,6 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import check
required_params = ('guestname', 'username', 'password',)
optional_params = ('expectedret')
@@ -69,7 +68,7 @@ def flag_check(params):
logger.info("vm %s failed to get ip address" % guestname)
return 1
- ret = check.remote_exec_pexpect(ipaddr, username, password, FLAG_CHECK)
+ ret = utils.remote_exec_pexpect(ipaddr, username, password, FLAG_CHECK)
if ret == "TIMEOUT!!!":
logger.error("connecting to guest OS timeout")
return 1
diff --git a/utils/check.py b/utils/check.py
deleted file mode 100644
index 1db49e7..0000000
--- a/utils/check.py
+++ /dev/null
@@ -1,392 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (C) 2010-2012 Red Hat, Inc.
-#
-# libvirt-test-API is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation, either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranties of
-# TITLE, NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>;.
-#
-# Filename: check.py
-# Summary: basic check operation needed by test
-# Description: The module is a tool to help conduct basic
-# check operation on specified host
-
-import os
-import re
-import time
-import string
-import pty
-import commands
-import signal
-import pexpect
-
-def support_virt(self):
- cmd = "cat /proc/cpuinfo | egrep '(vmx|svm)'"
- if commands.getoutput(cmd) is None:
- print 'CPU does not support VT.'
- return False
- else:
- return True
-
-def subproc(a, b):
- subproc_flag = 1
-
-def remote_exec(hostname, username, password, cmd):
- """Remote execution on specified host"""
- pid, fd = pty.fork()
- if pid == 0:
- try:
- os.execv("/usr/bin/ssh", ["/usr/bin/ssh",
"-l",
- username, hostname, cmd])
- except OSError, e:
- print "OSError: " + str(e)
- return -1
- else:
- signal.signal(signal.SIGCHLD, subproc)
- try:
- timeout = 50
- i = 0
- while i <= timeout:
-
- time.sleep(1)
- str = os.read(fd, 10240)
-
- if re.search('(yes\/no)', str):
- os.write(fd, "yes\r")
-
- elif re.search('password:', str):
- os.write(fd, password + "\r")
-
- elif subproc_flag == 1:
- ret = string.strip(str)
- break
- elif i == timeout:
- print "TIMEOUT!!!!"
- return -1
-
- i = i+1
-
- subproc_flag = 0
- return ret
- except Exception, e:
- subproc_flag = 0
- return -1
-
-def remote_exec_pexpect(hostname, username, password, cmd):
- """Remote exec function via pexpect"""
- user_hostname = "%s@%s" % (username, hostname)
- child = pexpect.spawn("/usr/bin/ssh", [user_hostname, cmd],
- timeout = 60, maxread = 2000, logfile = None)
- #child.logfile = sys.stdout
- while True:
- index = child.expect(['(yes\/no)', 'password:', pexpect.EOF,
- pexpect.TIMEOUT])
- if index == 0:
- child.sendline("yes")
- elif index == 1:
- child.sendline(password)
- elif index == 2:
- return string.strip(child.before)
- elif index == 3:
- return "TIMEOUT!!!"
-
-def get_remote_vcpus(hostname, username, password):
- """Get cpu number of specified host"""
- cmd = "cat /proc/cpuinfo | grep processor | wc -l"
- cpunum = -1
- i = 0
- while i < 3:
- i += 1
- cpunum = int(remote_exec(hostname, username, password, cmd))
- if cpunum == -1:
- continue
- else:
- break
- return cpunum
-
-def get_remote_memory(hostname, username, password):
- """Get memory statics of specified host"""
- cmd = "free -m | grep -i mem | awk '{print $2}'"
- memsize = -1
- i = 0
- while i < 3:
- i += 1
- memsize = \
- int(remote_exec_pexpect(hostname, username, password, cmd)) * 1024
- if memsize == -1:
- continue
- else:
- break
- return memsize
-
-def get_remote_kernel(hostname, username, password):
- """Get kernel info of specified host"""
- cmd = "uname -r"
- kernel = None
- i = 0
- while i < 3:
- i += 1
- kernel = remote_exec(hostname, username, password, cmd)
- if kernel:
- break
- else:
- continue
- return kernel
-
-def install_package(package = ''):
- """Install specified package"""
- if package:
- cmd = "rpm -qa " + package
- output = commands.getoutput(cmd)
- pkg = output.split('\n')[0]
- if pkg:
- os.system("yum -y -q update " + package)
- return pkg
- else:
- ret = os.system("yum -y -q install " + package)
- if ret == 0:
- output = commands.getoutput(cmd)
- pkg = output.split('\n')[0]
- if pkg:
- return pkg
- else:
- return "failed to install package"
- else:
- return "please input package name"
-
-def libvirt_version(latest_ver = ''):
- """Get libvirt version info"""
- query_virt_ver = 'rpm -qa|grep libvirt'
- ret = commands.getoutput(query_virt_ver)
- if ret:
- mas_ver = ret.split('-')[-2]
- sec_ver = (ret.split('-')[-1])
- curr_ver = mas_ver + '-' + sec_ver
- if latest_ver != '':
- if curr_ver != latest_ver:
- return (False, curr_ver)
- else:
- return (True, curr_ver)
- else:
- return curr_ver
- else:
- return (False, '')
-
-def create_dir(hostname, username, password):
- """Create new dir"""
- cmd = "mkdir /tmp/test"
- mkdir_ret = remote_exec_pexpect(hostname, username, password, cmd)
- if mkdir_ret == '':
- cmd = "ls -d /tmp/test"
- check_str = remote_exec_pexpect(hostname, username,
- password, cmd)
- if check_str == "/tmp/test":
- return 0
- else:
- print "check_str = ", check_str
- return 1
- else:
- print "mkdir_ret = ", mkdir_ret
- return 1
-
-def write_file(hostname, username, password):
- """Simple test for writting file on specified host"""
- test_string = 'hello word testing'
- cmd = """echo '%s'>/tmp/test/test.log""" %
(test_string)
- write_file_ret = remote_exec_pexpect(hostname, username,
- password, cmd)
- if write_file_ret == '':
- cmd = """grep '%s' /tmp/test/test.log""" %
("hello")
- check_str = remote_exec_pexpect(hostname, username,
- password, cmd)
- if check_str == test_string:
- return 0
- else:
- print "check_str = ", check_str
- return 1
- else:
- print "write_file_ret = ", write_file_ret
- return 1
-
-def run_mount_app(hostname, username, password,
- target_mount, mount_point):
- """Simple test for mount operation on specified
host"""
- cmd = """mount %s %s""" % (target_mount, mount_point)
- mount_ret = remote_exec(hostname, username, password, cmd)
- if mount_ret == '':
- cmd = """df | grep '%s'""" %
(target_mount)
- check_str = remote_exec(hostname, username, password, cmd)
- if check_str != '':
- return 0
- else:
- print "mount check fail"
- return 1
- else:
- print "mount fail"
- return 1
-
-def run_wget_app(hostname, username, password, file_url, logger):
- """Simple test for wget app on specified host"""
- cmd_line = "wget -P /tmp %s -o /tmp/wget.log" % (file_url)
- logger.info("Command: %s" % (cmd_line))
- wget_ret = remote_exec_pexpect(hostname, username,
- password, cmd_line)
- cmd_line = "grep %s %s" % ('100%', '/tmp/wget.log')
- check_ret = remote_exec_pexpect(hostname, username,
- password, cmd_line)
- if check_ret == "":
- logger.info("grep output is nothing")
- return 1
- else:
- if re.search("100%", check_ret):
- logger.info("wget is running successfully")
- logger.info("check_retrun: %s" % (check_ret))
- return 0
- else:
- logger.info("can not find 100% in wget output")
- logger.info("check_retrun: %s" % (check_ret))
- return 1
-
-def validate_remote_nic_type(hostname, username,
- password, nic_type, logger):
- """Validate network interface type on specified
host"""
- nic_type_to_name_dict = {'e1000':
- '82540EM Gigabit Ethernet Controller',
- 'rtl8139':
- 'RTL-8139/8139C/8139C+',
- 'virtio':'Virtio network device'}
- nic_type_to_driver_dict = {'e1000':'e1000',
'rtl8139':'8139cp',
- 'virtio':'virtio_net'}
- nic_name = nic_type_to_name_dict[nic_type]
- nic_driver = nic_type_to_driver_dict[nic_type]
- logger.info("nic_name = %s" % (nic_name))
- logger.info("nic_driver = %s" % (nic_driver))
- lspci_cmd = "lspci"
- lsmod_cmd = "lsmod"
- lspci_cmd_ret = remote_exec_pexpect(hostname, username,
- password, lspci_cmd)
- lsmod_cmd_ret = remote_exec_pexpect(hostname, username,
- password, lsmod_cmd)
- logger.info("------------")
- logger.info("lspci_cmd_ret:\n %s" % (lspci_cmd_ret))
- logger.info("------------")
- logger.info("lsmod_cmd_ret:\n %s" % (lsmod_cmd_ret))
- logger.info("------------")
- if lspci_cmd_ret != "" and lsmod_cmd_ret != "":
- cmd1 = """echo "%s" | grep
'%s'""" % (lspci_cmd_ret, nic_name)
- cmd2 = """echo "%s" | grep
'%s'""" % (lsmod_cmd_ret, nic_driver)
- status1, output1 = commands.getstatusoutput(cmd1)
- status2, output2 = commands.getstatusoutput(cmd2)
- if status1 == 0 and status2 == 0:
- # other nic should not be seen in guest
- nic_type_to_name_dict.pop(nic_type)
- for key in nic_type_to_name_dict.keys():
- logger.info("now try to grep other nic type \
- in lspci output: %s" % key)
- other_name_cmd = """echo '%s' | grep
'%s'""" % \
- (lspci_cmd_ret, nic_type_to_name_dict[key])
- ret, out = commands.getstatusoutput(other_name_cmd)
- if ret == 0:
- logger.info("unspecified nic name is seen in \
- guest's lspci command: \n %s \n" % out)
- return 1
-
- nic_type_to_driver_dict.pop(nic_type)
- for key in nic_type_to_driver_dict.keys():
- logger.info("now try to grep other nic type \
- in lsmod output: %s" % key)
- other_driver_cmd = """echo '%s' | grep
'%s'""" % \
- (lsmod_cmd_ret,
- nic_type_to_driver_dict[key])
- ret1, out1 = commands.getstatusoutput(other_driver_cmd)
- if ret1 == 0:
- logger.info("unspecified nic driver is seen \
- in guest's lsmod command: %s" % out)
- return 1
-
- logger.info("lspci ouput about nic is: \n %s; \n \
- lsmod output about nic is \n %s \n" %
- (output1,output2))
- return 0
- else:
- logger.info("lspci and lsmod and grep fail")
- return 1
- else:
- logger.info("lspci and lsmod return nothing")
- return 1
-
-def validate_remote_blk_type(hostname, username, password,
- blk_type, logger):
- """Validate block device type on specified host"""
- blk_type_to_name_dict = {'ide':'Intel Corporation 82371SB PIIX3
IDE',
- 'virtio':'Virtio block device'}
- blk_type_to_driver_dict = {'ide':'unknow',
'virtio':'virtio_blk'}
- lspci_cmd = "lspci"
- lsmod_cmd = "lsmod"
- lspci_cmd_ret = remote_exec_pexpect(hostname, username,
- password, lspci_cmd)
- lsmod_cmd_ret = remote_exec_pexpect(hostname, username,
- password, lsmod_cmd)
- logger.info("------------")
- logger.info("lspci_cmd_ret:\n %s" % (lspci_cmd_ret))
- logger.info("------------")
- logger.info("lsmod_cmd_ret: \n %s" % (lsmod_cmd_ret))
- logger.info("------------")
- if lspci_cmd_ret != "" and lsmod_cmd_ret != "":
- if blk_type == "virtio":
- blk_name = blk_type_to_name_dict[blk_type]
- blk_driver = blk_type_to_driver_dict[blk_type]
- logger.info("blk_name = %s \n blk_driver = %s" %
- (blk_name, blk_driver))
- cmd1 = """echo "%s" | grep
'%s'""" % (lspci_cmd_ret, blk_name)
- cmd2 = """echo "%s" | grep
'%s'""" % (lsmod_cmd_ret, blk_driver)
- status1, output1 = commands.getstatusoutput(cmd1)
- status2, output2 = commands.getstatusoutput(cmd2)
- if status1 == 0 and status2 == 0:
- logger.info("block device type is virtio")
- return 0
- else:
- return 1
-
- # this check will not check ide type block device
- if blk_type == "ide":
- # virtio block device should not be seen in guest
- blk_type_to_name_dict.pop(blk_type)
- for key in blk_type_to_name_dict.keys():
- logger.info(
- "now try to grep other blk type in lspci output: %s" %
- key)
- other_name_cmd = """echo "%s" | grep
'%s'""" % \
- (lspci_cmd_ret, blk_type_to_name_dict[key])
- ret, out = commands.getstatusoutput(other_name_cmd)
- if ret == 0:
- logger.info("unspecified blk name is seen in guest's \
- lspci command: \n %s \n" % out)
- return 1
- blk_type_to_driver_dict.pop(blk_type)
- for key in blk_type_to_driver_dict.keys():
- logger.info(
- "now try to grep other blk type in lsmod output: %s" %
- key)
- other_driver_cmd = """echo '%s' | grep
'%s'""" % \
- (lsmod_cmd_ret,
- blk_type_to_driver_dict[key])
- ret1, out1 = commands.getstatusoutput(other_driver_cmd)
- if ret1 == 0:
- logger.info("unspecified blk driver is seen \
- in guest's lsmod command: \n %s \n" % out)
- return 1
- logger.info("block device type is ide")
- return 0
- else:
- logger.info("lspci and lsmod return nothing")
- return 1
diff --git a/utils/utils.py b/utils/utils.py
index 124c986..a216fa7 100644
--- a/utils/utils.py
+++ b/utils/utils.py
@@ -427,3 +427,365 @@ def scp_file(hostname, username, password, target_path, file):
return 1
return 0
+
+def support_virt(self):
+ cmd = "cat /proc/cpuinfo | egrep '(vmx|svm)'"
+ if commands.getoutput(cmd) is None:
+ print 'CPU does not support VT.'
+ return False
+ else:
+ return True
+
+def subproc(a, b):
+ subproc_flag = 1
+
+def remote_exec(hostname, username, password, cmd):
+ """Remote execution on specified host"""
+ pid, fd = pty.fork()
+ if pid == 0:
+ try:
+ os.execv("/usr/bin/ssh", ["/usr/bin/ssh",
"-l",
+ username, hostname, cmd])
+ except OSError, e:
+ print "OSError: " + str(e)
+ return -1
+ else:
+ signal.signal(signal.SIGCHLD, subproc)
+ try:
+ timeout = 50
+ i = 0
+ while i <= timeout:
+
+ time.sleep(1)
+ str = os.read(fd, 10240)
+
+ if re.search('(yes\/no)', str):
+ os.write(fd, "yes\r")
+
+ elif re.search('password:', str):
+ os.write(fd, password + "\r")
+
+ elif subproc_flag == 1:
+ ret = string.strip(str)
+ break
+ elif i == timeout:
+ print "TIMEOUT!!!!"
+ return -1
+
+ i = i+1
+
+ subproc_flag = 0
+ return ret
+ except Exception, e:
+ subproc_flag = 0
+ return -1
+
+def remote_exec_pexpect(hostname, username, password, cmd):
+ """Remote exec function via pexpect"""
+ user_hostname = "%s@%s" % (username, hostname)
+ child = pexpect.spawn("/usr/bin/ssh", [user_hostname, cmd],
+ timeout = 60, maxread = 2000, logfile = None)
+ #child.logfile = sys.stdout
+ while True:
+ index = child.expect(['(yes\/no)', 'password:', pexpect.EOF,
+ pexpect.TIMEOUT])
+ if index == 0:
+ child.sendline("yes")
+ elif index == 1:
+ child.sendline(password)
+ elif index == 2:
+ return string.strip(child.before)
+ elif index == 3:
+ return "TIMEOUT!!!"
+
+def get_remote_vcpus(hostname, username, password):
+ """Get cpu number of specified host"""
+ cmd = "cat /proc/cpuinfo | grep processor | wc -l"
+ cpunum = -1
+ i = 0
+ while i < 3:
+ i += 1
+ cpunum = int(remote_exec(hostname, username, password, cmd))
+ if cpunum == -1:
+ continue
+ else:
+ break
+ return cpunum
+
+def get_remote_memory(hostname, username, password):
+ """Get memory statics of specified host"""
+ cmd = "free -m | grep -i mem | awk '{print $2}'"
+ memsize = -1
+ i = 0
+ while i < 3:
+ i += 1
+ memsize = \
+ int(remote_exec_pexpect(hostname, username, password, cmd)) * 1024
+ if memsize == -1:
+ continue
+ else:
+ break
+ return memsize
+
+def get_remote_kernel(hostname, username, password):
+ """Get kernel info of specified host"""
+ cmd = "uname -r"
+ kernel = None
+ i = 0
+ while i < 3:
+ i += 1
+ kernel = remote_exec(hostname, username, password, cmd)
+ if kernel:
+ break
+ else:
+ continue
+ return kernel
+
+def install_package(package = ''):
+ """Install specified package"""
+ if package:
+ cmd = "rpm -qa " + package
+ output = commands.getoutput(cmd)
+ pkg = output.split('\n')[0]
+ if pkg:
+ os.system("yum -y -q update " + package)
+ return pkg
+ else:
+ ret = os.system("yum -y -q install " + package)
+ if ret == 0:
+ output = commands.getoutput(cmd)
+ pkg = output.split('\n')[0]
+ if pkg:
+ return pkg
+ else:
+ return "failed to install package"
+ else:
+ return "please input package name"
+
+def libvirt_version(latest_ver = ''):
+ """Get libvirt version info"""
+ query_virt_ver = 'rpm -qa|grep libvirt'
+ ret = commands.getoutput(query_virt_ver)
+ if ret:
+ mas_ver = ret.split('-')[-2]
+ sec_ver = (ret.split('-')[-1])
+ curr_ver = mas_ver + '-' + sec_ver
+ if latest_ver != '':
+ if curr_ver != latest_ver:
+ return (False, curr_ver)
+ else:
+ return (True, curr_ver)
+ else:
+ return curr_ver
+ else:
+ return (False, '')
+
+def create_dir(hostname, username, password):
+ """Create new dir"""
+ cmd = "mkdir /tmp/test"
+ mkdir_ret = remote_exec_pexpect(hostname, username, password, cmd)
+ if mkdir_ret == '':
+ cmd = "ls -d /tmp/test"
+ check_str = remote_exec_pexpect(hostname, username,
+ password, cmd)
+ if check_str == "/tmp/test":
+ return 0
+ else:
+ print "check_str = ", check_str
+ return 1
+ else:
+ print "mkdir_ret = ", mkdir_ret
+ return 1
+
+def write_file(hostname, username, password):
+ """Simple test for writting file on specified host"""
+ test_string = 'hello word testing'
+ cmd = """echo '%s'>/tmp/test/test.log""" %
(test_string)
+ write_file_ret = remote_exec_pexpect(hostname, username,
+ password, cmd)
+ if write_file_ret == '':
+ cmd = """grep '%s' /tmp/test/test.log""" %
("hello")
+ check_str = remote_exec_pexpect(hostname, username,
+ password, cmd)
+ if check_str == test_string:
+ return 0
+ else:
+ print "check_str = ", check_str
+ return 1
+ else:
+ print "write_file_ret = ", write_file_ret
+ return 1
+
+def run_mount_app(hostname, username, password,
+ target_mount, mount_point):
+ """Simple test for mount operation on specified
host"""
+ cmd = """mount %s %s""" % (target_mount, mount_point)
+ mount_ret = remote_exec(hostname, username, password, cmd)
+ if mount_ret == '':
+ cmd = """df | grep '%s'""" %
(target_mount)
+ check_str = remote_exec(hostname, username, password, cmd)
+ if check_str != '':
+ return 0
+ else:
+ print "mount check fail"
+ return 1
+ else:
+ print "mount fail"
+ return 1
+
+def run_wget_app(hostname, username, password, file_url, logger):
+ """Simple test for wget app on specified host"""
+ cmd_line = "wget -P /tmp %s -o /tmp/wget.log" % (file_url)
+ logger.info("Command: %s" % (cmd_line))
+ wget_ret = remote_exec_pexpect(hostname, username,
+ password, cmd_line)
+ cmd_line = "grep %s %s" % ('100%', '/tmp/wget.log')
+ check_ret = remote_exec_pexpect(hostname, username,
+ password, cmd_line)
+ if check_ret == "":
+ logger.info("grep output is nothing")
+ return 1
+ else:
+ if re.search("100%", check_ret):
+ logger.info("wget is running successfully")
+ logger.info("check_retrun: %s" % (check_ret))
+ return 0
+ else:
+ logger.info("can not find 100% in wget output")
+ logger.info("check_retrun: %s" % (check_ret))
+ return 1
+
+def validate_remote_nic_type(hostname, username,
+ password, nic_type, logger):
+ """Validate network interface type on specified
host"""
+ nic_type_to_name_dict = {'e1000':
+ '82540EM Gigabit Ethernet Controller',
+ 'rtl8139':
+ 'RTL-8139/8139C/8139C+',
+ 'virtio':'Virtio network device'}
+ nic_type_to_driver_dict = {'e1000':'e1000',
'rtl8139':'8139cp',
+ 'virtio':'virtio_net'}
+ nic_name = nic_type_to_name_dict[nic_type]
+ nic_driver = nic_type_to_driver_dict[nic_type]
+ logger.info("nic_name = %s" % (nic_name))
+ logger.info("nic_driver = %s" % (nic_driver))
+ lspci_cmd = "lspci"
+ lsmod_cmd = "lsmod"
+ lspci_cmd_ret = remote_exec_pexpect(hostname, username,
+ password, lspci_cmd)
+ lsmod_cmd_ret = remote_exec_pexpect(hostname, username,
+ password, lsmod_cmd)
+ logger.info("------------")
+ logger.info("lspci_cmd_ret:\n %s" % (lspci_cmd_ret))
+ logger.info("------------")
+ logger.info("lsmod_cmd_ret:\n %s" % (lsmod_cmd_ret))
+ logger.info("------------")
+ if lspci_cmd_ret != "" and lsmod_cmd_ret != "":
+ cmd1 = """echo "%s" | grep
'%s'""" % (lspci_cmd_ret, nic_name)
+ cmd2 = """echo "%s" | grep
'%s'""" % (lsmod_cmd_ret, nic_driver)
+ status1, output1 = commands.getstatusoutput(cmd1)
+ status2, output2 = commands.getstatusoutput(cmd2)
+ if status1 == 0 and status2 == 0:
+ # other nic should not be seen in guest
+ nic_type_to_name_dict.pop(nic_type)
+ for key in nic_type_to_name_dict.keys():
+ logger.info("now try to grep other nic type \
+ in lspci output: %s" % key)
+ other_name_cmd = """echo '%s' | grep
'%s'""" % \
+ (lspci_cmd_ret, nic_type_to_name_dict[key])
+ ret, out = commands.getstatusoutput(other_name_cmd)
+ if ret == 0:
+ logger.info("unspecified nic name is seen in \
+ guest's lspci command: \n %s \n" % out)
+ return 1
+
+ nic_type_to_driver_dict.pop(nic_type)
+ for key in nic_type_to_driver_dict.keys():
+ logger.info("now try to grep other nic type \
+ in lsmod output: %s" % key)
+ other_driver_cmd = """echo '%s' | grep
'%s'""" % \
+ (lsmod_cmd_ret,
+ nic_type_to_driver_dict[key])
+ ret1, out1 = commands.getstatusoutput(other_driver_cmd)
+ if ret1 == 0:
+ logger.info("unspecified nic driver is seen \
+ in guest's lsmod command: %s" % out)
+ return 1
+
+ logger.info("lspci ouput about nic is: \n %s; \n \
+ lsmod output about nic is \n %s \n" %
+ (output1,output2))
+ return 0
+ else:
+ logger.info("lspci and lsmod and grep fail")
+ return 1
+ else:
+ logger.info("lspci and lsmod return nothing")
+ return 1
+
+def validate_remote_blk_type(hostname, username, password,
+ blk_type, logger):
+ """Validate block device type on specified host"""
+ blk_type_to_name_dict = {'ide':'Intel Corporation 82371SB PIIX3
IDE',
+ 'virtio':'Virtio block device'}
+ blk_type_to_driver_dict = {'ide':'unknow',
'virtio':'virtio_blk'}
+ lspci_cmd = "lspci"
+ lsmod_cmd = "lsmod"
+ lspci_cmd_ret = remote_exec_pexpect(hostname, username,
+ password, lspci_cmd)
+ lsmod_cmd_ret = remote_exec_pexpect(hostname, username,
+ password, lsmod_cmd)
+ logger.info("------------")
+ logger.info("lspci_cmd_ret:\n %s" % (lspci_cmd_ret))
+ logger.info("------------")
+ logger.info("lsmod_cmd_ret: \n %s" % (lsmod_cmd_ret))
+ logger.info("------------")
+ if lspci_cmd_ret != "" and lsmod_cmd_ret != "":
+ if blk_type == "virtio":
+ blk_name = blk_type_to_name_dict[blk_type]
+ blk_driver = blk_type_to_driver_dict[blk_type]
+ logger.info("blk_name = %s \n blk_driver = %s" %
+ (blk_name, blk_driver))
+ cmd1 = """echo "%s" | grep
'%s'""" % (lspci_cmd_ret, blk_name)
+ cmd2 = """echo "%s" | grep
'%s'""" % (lsmod_cmd_ret, blk_driver)
+ status1, output1 = commands.getstatusoutput(cmd1)
+ status2, output2 = commands.getstatusoutput(cmd2)
+ if status1 == 0 and status2 == 0:
+ logger.info("block device type is virtio")
+ return 0
+ else:
+ return 1
+
+ # this check will not check ide type block device
+ if blk_type == "ide":
+ # virtio block device should not be seen in guest
+ blk_type_to_name_dict.pop(blk_type)
+ for key in blk_type_to_name_dict.keys():
+ logger.info(
+ "now try to grep other blk type in lspci output: %s" %
+ key)
+ other_name_cmd = """echo "%s" | grep
'%s'""" % \
+ (lspci_cmd_ret, blk_type_to_name_dict[key])
+ ret, out = commands.getstatusoutput(other_name_cmd)
+ if ret == 0:
+ logger.info("unspecified blk name is seen in guest's \
+ lspci command: \n %s \n" % out)
+ return 1
+ blk_type_to_driver_dict.pop(blk_type)
+ for key in blk_type_to_driver_dict.keys():
+ logger.info(
+ "now try to grep other blk type in lsmod output: %s" %
+ key)
+ other_driver_cmd = """echo '%s' | grep
'%s'""" % \
+ (lsmod_cmd_ret,
+ blk_type_to_driver_dict[key])
+ ret1, out1 = commands.getstatusoutput(other_driver_cmd)
+ if ret1 == 0:
+ logger.info("unspecified blk driver is seen \
+ in guest's lsmod command: \n %s \n" % out)
+ return 1
+ logger.info("block device type is ide")
+ return 0
+ else:
+ logger.info("lspci and lsmod return nothing")
+ return 1
--
1.7.7.3
4:36 a.m.
New subject: [libvirt] [test-API 03/14] Destroy utils/check.py and move the functions into utils/utils.py
On 04/19/2012 10:25 AM, Osier Yang wrote:
Scripts which use 'check.py' are updated to use
"utils.py".
---
repos/domain/balloon_memory.py | 2 +-
repos/domain/dump.py | 2 +-
repos/domain/install_linux_check.py | 15 +-
repos/snapshot/file_flag.py | 3 +-
repos/snapshot/flag_check.py | 3 +-
utils/check.py | 392 -----------------------------------
utils/utils.py | 362 ++++++++++++++++++++++++++++++++
7 files changed, 373 insertions(+), 406 deletions(-)
delete mode 100644 utils/check.py
I support the idea, but we really need a run to ensure no break
ACK
Guannan Ren
9:25 p.m.
New subject: [libvirt] [test-API 04/14] Move directory dist to src
env_inspect.py is part of the framework.
---
{dist => src/dist}/__init__.py | 0
{dist => src/dist}/redhat/__init__.py | 0
{dist => src/dist}/redhat/env_inspect.py | 0
src/generator.py | 4 ++--
4 files changed, 2 insertions(+), 2 deletions(-)
rename {dist => src/dist}/__init__.py (100%)
rename {dist => src/dist}/redhat/__init__.py (100%)
rename {dist => src/dist}/redhat/env_inspect.py (100%)
diff --git a/dist/__init__.py b/src/dist/__init__.py
similarity index 100%
rename from dist/__init__.py
rename to src/dist/__init__.py
diff --git a/dist/redhat/__init__.py b/src/dist/redhat/__init__.py
similarity index 100%
rename from dist/redhat/__init__.py
rename to src/dist/redhat/__init__.py
diff --git a/dist/redhat/env_inspect.py b/src/dist/redhat/env_inspect.py
similarity index 100%
rename from dist/redhat/env_inspect.py
rename to src/dist/redhat/env_inspect.py
diff --git a/src/generator.py b/src/generator.py
index e3bc344..26e1553 100644
--- a/src/generator.py
+++ b/src/generator.py
@@ -32,9 +32,9 @@ 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
# sensible distribution-specific package
-for dist in os.listdir('dist'):
+for dist in os.listdir('src/dist'):
if os.path.exists('/etc/%s-release' % dist):
- exec('from dist.%s import env_inspect' % dist)
+ exec('from src.dist.%s import env_inspect' % dist)
break
class FuncGen(object):
--
1.7.7.3
4:38 a.m.
New subject: [libvirt] [test-API 04/14] Move directory dist to src
On 04/19/2012 10:25 AM, Osier Yang wrote:
env_inspect.py is part of the framework.
---
{dist => src/dist}/__init__.py | 0
{dist => src/dist}/redhat/__init__.py | 0
{dist => src/dist}/redhat/env_inspect.py | 0
src/generator.py | 4 ++--
4 files changed, 2 insertions(+), 2 deletions(-)
rename {dist => src/dist}/__init__.py (100%)
rename {dist => src/dist}/redhat/__init__.py (100%)
rename {dist => src/dist}/redhat/env_inspect.py (100%)
diff --git a/dist/__init__.py b/src/dist/__init__.py
similarity index 100%
rename from dist/__init__.py
rename to src/dist/__init__.py
diff --git a/dist/redhat/__init__.py b/src/dist/redhat/__init__.py
similarity index 100%
rename from dist/redhat/__init__.py
rename to src/dist/redhat/__init__.py
diff --git a/dist/redhat/env_inspect.py b/src/dist/redhat/env_inspect.py
similarity index 100%
rename from dist/redhat/env_inspect.py
rename to src/dist/redhat/env_inspect.py
diff --git a/src/generator.py b/src/generator.py
index e3bc344..26e1553 100644
--- a/src/generator.py
+++ b/src/generator.py
@@ -32,9 +32,9 @@ 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
# sensible distribution-specific package
-for dist in os.listdir('dist'):
+for dist in os.listdir('src/dist'):
if os.path.exists('/etc/%s-release' % dist):
- exec('from dist.%s import env_inspect' % dist)
+ exec('from src.dist.%s import env_inspect' % dist)
break
class FuncGen(object):
maybe the dist folder should be removed.
I rewrote the env_inspect, it is more potable than checking the
rpm package.
so, the dist/redhat is not necessary strongly
ACK
Guannan Ren
4:37 a.m.
New subject: [libvirt] [test-API 04/14] Move directory dist to src
On 04/19/2012 11:38 AM, Guannan Ren wrote:
On 04/19/2012 10:25 AM, Osier Yang wrote:
> env_inspect.py is part of the framework.
> ---
> {dist => src/dist}/__init__.py | 0
> {dist => src/dist}/redhat/__init__.py | 0
> {dist => src/dist}/redhat/env_inspect.py | 0
> src/generator.py | 4 ++--
> 4 files changed, 2 insertions(+), 2 deletions(-)
> rename {dist => src/dist}/__init__.py (100%)
> rename {dist => src/dist}/redhat/__init__.py (100%)
> rename {dist => src/dist}/redhat/env_inspect.py (100%)
>
> diff --git a/dist/__init__.py b/src/dist/__init__.py
> similarity index 100%
> rename from dist/__init__.py
> rename to src/dist/__init__.py
> diff --git a/dist/redhat/__init__.py b/src/dist/redhat/__init__.py
> similarity index 100%
> rename from dist/redhat/__init__.py
> rename to src/dist/redhat/__init__.py
> diff --git a/dist/redhat/env_inspect.py b/src/dist/redhat/env_inspect.py
> similarity index 100%
> rename from dist/redhat/env_inspect.py
> rename to src/dist/redhat/env_inspect.py
> diff --git a/src/generator.py b/src/generator.py
> index e3bc344..26e1553 100644
> --- a/src/generator.py
> +++ b/src/generator.py
> @@ -32,9 +32,9 @@ 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
> # sensible distribution-specific package
> -for dist in os.listdir('dist'):
> +for dist in os.listdir('src/dist'):
> if os.path.exists('/etc/%s-release' % dist):
> - exec('from dist.%s import env_inspect' % dist)
> + exec('from src.dist.%s import env_inspect' % dist)
> break
>
> class FuncGen(object):
maybe the dist folder should be removed.
I rewrote the env_inspect, it is more potable than checking the
rpm package.
so, the dist/redhat is not necessary strongly
ACK
Guannan Ren
The new env_inspect is written universally, so it can be moved back, yes.
Martin
9:25 p.m.
New subject: [libvirt] [test-API 05/14] Move utils/env_parser.py into src
env_parser.py is to parse env.cfg, which is part of the framework.
---
repos/domain/install_image.py | 2 +-
repos/domain/install_linux_cdrom.py | 2 +-
repos/domain/install_linux_check.py | 2 +-
repos/domain/install_linux_net.py | 2 +-
repos/domain/install_windows_cdrom.py | 2 +-
{utils => src}/env_parser.py | 0
src/generator.py | 2 +-
src/parser.py | 2 +-
8 files changed, 7 insertions(+), 7 deletions(-)
rename {utils => src}/env_parser.py (100%)
diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py
index 88b35c1..89b7e40 100644
--- a/repos/domain/install_image.py
+++ b/repos/domain/install_image.py
@@ -11,8 +11,8 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
+from src import env_parser
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 f5af6db..342ed84 100644
--- a/repos/domain/install_linux_cdrom.py
+++ b/repos/domain/install_linux_cdrom.py
@@ -14,8 +14,8 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
+from src import env_parser
from utils import utils
-from utils import env_parser
from utils import xmlbuilder
required_params = ('guestname', 'guesttype', 'guestos',
'guestarch',)
diff --git a/repos/domain/install_linux_check.py b/repos/domain/install_linux_check.py
index 7a5a9ac..f4d04d9 100644
--- a/repos/domain/install_linux_check.py
+++ b/repos/domain/install_linux_check.py
@@ -12,8 +12,8 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
+from src import env_parser
from utils import utils
-from utils import env_parser
required_params = ('guestname', 'guesttype', 'hdmodel',
'nicmodel',)
optional_params = ('disksize',
diff --git a/repos/domain/install_linux_net.py b/repos/domain/install_linux_net.py
index 69f3279..8c8931d 100644
--- a/repos/domain/install_linux_net.py
+++ b/repos/domain/install_linux_net.py
@@ -14,8 +14,8 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
+from src import env_parser
from utils import utils
-from utils import env_parser
from utils import xmlbuilder
required_params = ('guestname', 'guesttype', 'guestos',
'guestarch','netmethod',)
diff --git a/repos/domain/install_windows_cdrom.py
b/repos/domain/install_windows_cdrom.py
index beeb7dd..652e721 100644
--- a/repos/domain/install_windows_cdrom.py
+++ b/repos/domain/install_windows_cdrom.py
@@ -13,8 +13,8 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
+from src import env_parser
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$\""
diff --git a/utils/env_parser.py b/src/env_parser.py
similarity index 100%
rename from utils/env_parser.py
rename to src/env_parser.py
diff --git a/src/generator.py b/src/generator.py
index 26e1553..1f19ea3 100644
--- a/src/generator.py
+++ b/src/generator.py
@@ -25,9 +25,9 @@ import os
import traceback
from src import mapper
+from src 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/src/parser.py b/src/parser.py
index f1c2a43..1c4abcb 100644
--- a/src/parser.py
+++ b/src/parser.py
@@ -23,8 +23,8 @@ import sys
import copy
import string
-from utils import env_parser
from src import exception
+from src import env_parser
class CaseFileParser(object):
""" Parser the case configuration file to generate a data list.
--
1.7.7.3
4:40 a.m.
New subject: [libvirt] [test-API 05/14] Move utils/env_parser.py into src
On 04/19/2012 10:25 AM, Osier Yang wrote:
env_parser.py is to parse env.cfg, which is part of the framework.
---
repos/domain/install_image.py | 2 +-
repos/domain/install_linux_cdrom.py | 2 +-
repos/domain/install_linux_check.py | 2 +-
repos/domain/install_linux_net.py | 2 +-
repos/domain/install_windows_cdrom.py | 2 +-
{utils => src}/env_parser.py | 0
src/generator.py | 2 +-
src/parser.py | 2 +-
8 files changed, 7 insertions(+), 7 deletions(-)
rename {utils => src}/env_parser.py (100%)
diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py
index 88b35c1..89b7e40 100644
--- a/repos/domain/install_image.py
+++ b/repos/domain/install_image.py
@@ -11,8 +11,8 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
+from src import env_parser
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 f5af6db..342ed84 100644
--- a/repos/domain/install_linux_cdrom.py
+++ b/repos/domain/install_linux_cdrom.py
@@ -14,8 +14,8 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
+from src import env_parser
from utils import utils
-from utils import env_parser
from utils import xmlbuilder
required_params = ('guestname', 'guesttype', 'guestos',
'guestarch',)
diff --git a/repos/domain/install_linux_check.py b/repos/domain/install_linux_check.py
index 7a5a9ac..f4d04d9 100644
--- a/repos/domain/install_linux_check.py
+++ b/repos/domain/install_linux_check.py
@@ -12,8 +12,8 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
+from src import env_parser
from utils import utils
-from utils import env_parser
required_params = ('guestname', 'guesttype', 'hdmodel',
'nicmodel',)
optional_params = ('disksize',
diff --git a/repos/domain/install_linux_net.py b/repos/domain/install_linux_net.py
index 69f3279..8c8931d 100644
--- a/repos/domain/install_linux_net.py
+++ b/repos/domain/install_linux_net.py
@@ -14,8 +14,8 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
+from src import env_parser
from utils import utils
-from utils import env_parser
from utils import xmlbuilder
required_params = ('guestname', 'guesttype', 'guestos',
'guestarch','netmethod',)
diff --git a/repos/domain/install_windows_cdrom.py
b/repos/domain/install_windows_cdrom.py
index beeb7dd..652e721 100644
--- a/repos/domain/install_windows_cdrom.py
+++ b/repos/domain/install_windows_cdrom.py
@@ -13,8 +13,8 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
+from src import env_parser
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$\""
diff --git a/utils/env_parser.py b/src/env_parser.py
similarity index 100%
rename from utils/env_parser.py
rename to src/env_parser.py
diff --git a/src/generator.py b/src/generator.py
index 26e1553..1f19ea3 100644
--- a/src/generator.py
+++ b/src/generator.py
@@ -25,9 +25,9 @@ import os
import traceback
from src import mapper
+from src 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/src/parser.py b/src/parser.py
index f1c2a43..1c4abcb 100644
--- a/src/parser.py
+++ b/src/parser.py
@@ -23,8 +23,8 @@ import sys
import copy
import string
-from utils import env_parser
from src import exception
+from src import env_parser
class CaseFileParser(object):
""" Parser the case configuration file to generate a data list.
ACK
Guannan Ren
9:25 p.m.
New subject: [libvirt] [test-API 06/14] Improve the comments telling what the scripts does for utils/*.py
What GNU recommends:
<quote>
<one line to give the program's name and a brief idea of what it does.>
Copyright (C)<year> <name of author>
</quote>
---
v1 was ACKed, but I forgot to push it, this is a rebasing on the same
files (some of them are moved to different place).
---
src/env_parser.py | 6 ++----
utils/XMLParser.py | 7 ++-----
utils/format.py | 6 ++----
utils/log.py | 6 ++----
utils/xmlbuilder.py | 6 ++----
utils/xmlgenerator.py | 6 ++----
6 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/src/env_parser.py b/src/env_parser.py
index 58f05fc..0d2f2a2 100644
--- a/src/env_parser.py
+++ b/src/env_parser.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# env_parser.py: Parser for environment config (env.cfg).
+#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,10 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>;.
-#
-# Filename: env_parser.py
-# Summary: parse the env configuration file
-# Description: The module is a tool to parse the env configuration file
import ConfigParser
import os
diff --git a/utils/XMLParser.py b/utils/XMLParser.py
index b254023..20a376e 100644
--- a/utils/XMLParser.py
+++ b/utils/XMLParser.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# XMLParser.py: Parse XML document, the result is a python dict.
+#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,11 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>;.
-#
-# Filename: XMLParser.py
-# Summary: parse and xml document into a python dictionary
-# Description: The module is a tool to parses
-# and xml document into a python dictionary
import os
from xml.dom import minidom
diff --git a/utils/format.py b/utils/format.py
index cb2b8e0..5d69e5c 100644
--- a/utils/format.py
+++ b/utils/format.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# format.py: Print logging message in specific format.
+#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,10 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>;.
-#
-# Filename: format.py
-# Summary: generate specified kind of format string
-# Description: The module is a tool to generate specified kind of format string
import os
from string import Template
diff --git a/utils/log.py b/utils/log.py
index 3ca8729..4111fd9 100644
--- a/utils/log.py
+++ b/utils/log.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# log.py: Classes for logging.
+#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,10 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>;.
-#
-# Filename: log.py
-# Summary: log file operation
-# Description: The module is a tool to provide basic log file operation
import time
import os
diff --git a/utils/xmlbuilder.py b/utils/xmlbuilder.py
index a8a9871..d2ce6bb 100644
--- a/utils/xmlbuilder.py
+++ b/utils/xmlbuilder.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# xmlbuilder.py: Class for building XML for libvirt objects.
+#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,10 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>;.
-#
-# Filename: xmlbuilder.py
-# Summary: operation for building domain xml
-# Description: The module is to provide operation for building domain xml
__DEBUG__ = False
diff --git a/utils/xmlgenerator.py b/utils/xmlgenerator.py
index 7f5839b..ee019b7 100644
--- a/utils/xmlgenerator.py
+++ b/utils/xmlgenerator.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# xmlgenerator.py: Generate XML for libvirt objects.
+#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,10 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>;.
-#
-# Filename: xmlgenerator.py
-# Summary: generate domain xml
-# Description: The module is a tool to generate domain xml
import os
import sys
--
1.7.7.3
4:42 a.m.
New subject: [libvirt] [test-API 06/14] Improve the comments telling what the scripts does for utils/*.py
On 04/19/2012 10:25 AM, Osier Yang wrote:
What GNU recommends:
<quote>
<one line to give the program's name and a brief idea of what it does.>
Copyright (C)<year> <name of author>
</quote>
---
v1 was ACKed, but I forgot to push it, this is a rebasing on the same
files (some of them are moved to different place).
---
src/env_parser.py | 6 ++----
utils/XMLParser.py | 7 ++-----
utils/format.py | 6 ++----
utils/log.py | 6 ++----
utils/xmlbuilder.py | 6 ++----
utils/xmlgenerator.py | 6 ++----
6 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/src/env_parser.py b/src/env_parser.py
index 58f05fc..0d2f2a2 100644
--- a/src/env_parser.py
+++ b/src/env_parser.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# env_parser.py: Parser for environment config (env.cfg).
+#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,10 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see<http://www.gnu.org/licenses/>;.
-#
-# Filename: env_parser.py
-# Summary: parse the env configuration file
-# Description: The module is a tool to parse the env configuration file
import ConfigParser
import os
diff --git a/utils/XMLParser.py b/utils/XMLParser.py
index b254023..20a376e 100644
--- a/utils/XMLParser.py
+++ b/utils/XMLParser.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# XMLParser.py: Parse XML document, the result is a python dict.
+#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,11 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see<http://www.gnu.org/licenses/>;.
-#
-# Filename: XMLParser.py
-# Summary: parse and xml document into a python dictionary
-# Description: The module is a tool to parses
-# and xml document into a python dictionary
import os
from xml.dom import minidom
diff --git a/utils/format.py b/utils/format.py
index cb2b8e0..5d69e5c 100644
--- a/utils/format.py
+++ b/utils/format.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# format.py: Print logging message in specific format.
+#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,10 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see<http://www.gnu.org/licenses/>;.
-#
-# Filename: format.py
-# Summary: generate specified kind of format string
-# Description: The module is a tool to generate specified kind of format string
import os
from string import Template
diff --git a/utils/log.py b/utils/log.py
index 3ca8729..4111fd9 100644
--- a/utils/log.py
+++ b/utils/log.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# log.py: Classes for logging.
+#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,10 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see<http://www.gnu.org/licenses/>;.
-#
-# Filename: log.py
-# Summary: log file operation
-# Description: The module is a tool to provide basic log file operation
import time
import os
diff --git a/utils/xmlbuilder.py b/utils/xmlbuilder.py
index a8a9871..d2ce6bb 100644
--- a/utils/xmlbuilder.py
+++ b/utils/xmlbuilder.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# xmlbuilder.py: Class for building XML for libvirt objects.
+#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,10 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see<http://www.gnu.org/licenses/>;.
-#
-# Filename: xmlbuilder.py
-# Summary: operation for building domain xml
-# Description: The module is to provide operation for building domain xml
__DEBUG__ = False
diff --git a/utils/xmlgenerator.py b/utils/xmlgenerator.py
index 7f5839b..ee019b7 100644
--- a/utils/xmlgenerator.py
+++ b/utils/xmlgenerator.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# xmlgenerator.py: Generate XML for libvirt objects.
+#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,10 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see<http://www.gnu.org/licenses/>;.
-#
-# Filename: xmlgenerator.py
-# Summary: generate domain xml
-# Description: The module is a tool to generate domain xml
import os
import sys
ACK
Guannan Ren
9:25 p.m.
New subject: [libvirt] [test-API 07/14] Improve more comments to tell what the program does
---
src/dist/redhat/env_inspect.py | 5 ++---
src/exception.py | 7 ++-----
src/logxmlparser.py | 7 ++-----
src/process.py | 7 ++-----
4 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/src/dist/redhat/env_inspect.py b/src/dist/redhat/env_inspect.py
index 06f6408..4942b33 100644
--- a/src/dist/redhat/env_inspect.py
+++ b/src/dist/redhat/env_inspect.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# env_inspect.py: Check the testing environment.
+
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,9 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>;.
-#
-# Filename: envinspect.py
-# Description: check the testing environment and state of libvirt as well
import commands
import libvirt
diff --git a/src/exception.py b/src/exception.py
index 3625dab..7f67602 100644
--- a/src/exception.py
+++ b/src/exception.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# exception.py: Exceptions for the framework.
+#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,11 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>;.
-#
-# Filename: exception.py
-# Summary: the exception class
-# Description: The module defines the exceptions the framework could use
-# when fatal error occurred.
import libvirt
diff --git a/src/logxmlparser.py b/src/logxmlparser.py
index 6e0b531..3b377ce 100644
--- a/src/logxmlparser.py
+++ b/src/logxmlparser.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# logxmlparser.py: Generate output log file in XML format.
+
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,11 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>;.
-#
-# Filename: xmlparser.py
-# Summary: generate xmlfile for log management
-# Description: The module gives methods to write xml block
-# during a testrun running
import os
import copy
diff --git a/src/process.py b/src/process.py
index b34c9af..71d26ea 100644
--- a/src/process.py
+++ b/src/process.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# process.py: Multiple process module
+#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,11 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>;.
-#
-# Filename: process.py
-# Summary: multiprocessing module
-# Description: If the switch of multiprocessing is on,
-# the module will be called to fork subprocess
import os
import sys
--
1.7.7.3
4:46 a.m.
New subject: [libvirt] [test-API 07/14] Improve more comments to tell what the program does
On 04/19/2012 10:25 AM, Osier Yang wrote:
---
src/dist/redhat/env_inspect.py | 5 ++---
src/exception.py | 7 ++-----
src/logxmlparser.py | 7 ++-----
src/process.py | 7 ++-----
4 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/src/dist/redhat/env_inspect.py b/src/dist/redhat/env_inspect.py
index 06f6408..4942b33 100644
--- a/src/dist/redhat/env_inspect.py
+++ b/src/dist/redhat/env_inspect.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# env_inspect.py: Check the testing environment.
+
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,9 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see<http://www.gnu.org/licenses/>;.
-#
-# Filename: envinspect.py
-# Description: check the testing environment and state of libvirt as well
import commands
import libvirt
diff --git a/src/exception.py b/src/exception.py
index 3625dab..7f67602 100644
--- a/src/exception.py
+++ b/src/exception.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# exception.py: Exceptions for the framework.
+#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,11 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see<http://www.gnu.org/licenses/>;.
-#
-# Filename: exception.py
-# Summary: the exception class
-# Description: The module defines the exceptions the framework could use
-# when fatal error occurred.
import libvirt
diff --git a/src/logxmlparser.py b/src/logxmlparser.py
index 6e0b531..3b377ce 100644
--- a/src/logxmlparser.py
+++ b/src/logxmlparser.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# logxmlparser.py: Generate output log file in XML format.
+
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,11 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see<http://www.gnu.org/licenses/>;.
-#
-# Filename: xmlparser.py
-# Summary: generate xmlfile for log management
-# Description: The module gives methods to write xml block
-# during a testrun running
import os
import copy
diff --git a/src/process.py b/src/process.py
index b34c9af..71d26ea 100644
--- a/src/process.py
+++ b/src/process.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
#
+# process.py: Multiple process module
+#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
# libvirt-test-API is free software; you can redistribute it and/or
@@ -14,11 +16,6 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see<http://www.gnu.org/licenses/>;.
-#
-# Filename: process.py
-# Summary: multiprocessing module
-# Description: If the switch of multiprocessing is on,
-# the module will be called to fork subprocess
import os
import sys
ACK
Guannan Ren
9:25 p.m.
New subject: [libvirt] [test-API 08/14] Remove trainling blank lines for utils/*.sh
---
utils/dev_num.sh | 3 ---
utils/disk_num.sh | 3 ---
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/utils/dev_num.sh b/utils/dev_num.sh
index 9f50398..5e79313 100755
--- a/utils/dev_num.sh
+++ b/utils/dev_num.sh
@@ -23,6 +23,3 @@ else
rm -f guestdump.xml
exit 1
fi
-
-
-
diff --git a/utils/disk_num.sh b/utils/disk_num.sh
index 97a6248..8c10e52 100755
--- a/utils/disk_num.sh
+++ b/utils/disk_num.sh
@@ -21,6 +21,3 @@ else
rm -f guestdump.xml
exit 1
fi
-
-
-
--
1.7.7.3
4:47 a.m.
New subject: [libvirt] [test-API 08/14] Remove trainling blank lines for utils/*.sh
On 04/19/2012 10:25 AM, Osier Yang wrote:
---
utils/dev_num.sh | 3 ---
utils/disk_num.sh | 3 ---
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/utils/dev_num.sh b/utils/dev_num.sh
index 9f50398..5e79313 100755
--- a/utils/dev_num.sh
+++ b/utils/dev_num.sh
@@ -23,6 +23,3 @@ else
rm -f guestdump.xml
exit 1
fi
-
-
-
diff --git a/utils/disk_num.sh b/utils/disk_num.sh
index 97a6248..8c10e52 100755
--- a/utils/disk_num.sh
+++ b/utils/disk_num.sh
@@ -21,6 +21,3 @@ else
rm -f guestdump.xml
exit 1
fi
-
-
-
ACK
Guannan Ren
9:25 p.m.
New subject: [libvirt] [test-API 09/14] Use bash as the interpreter explicitly
---
utils/dev_num.sh | 2 +-
utils/disk_num.sh | 2 +-
utils/ipget.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/utils/dev_num.sh b/utils/dev_num.sh
index 5e79313..552721b 100755
--- a/utils/dev_num.sh
+++ b/utils/dev_num.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# counting disk and interface numbers
guestname=$1
diff --git a/utils/disk_num.sh b/utils/disk_num.sh
index 8c10e52..57f46aa 100755
--- a/utils/disk_num.sh
+++ b/utils/disk_num.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
guestname=$1
if [[ -z $guestname ]]; then
diff --git a/utils/ipget.sh b/utils/ipget.sh
index 8d44b14..dd074be 100755
--- a/utils/ipget.sh
+++ b/utils/ipget.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
mac=$1
if [[ -z $mac ]]; then
--
1.7.7.3
4:51 a.m.
New subject: [libvirt] [test-API 09/14] Use bash as the interpreter explicitly
On 04/19/2012 10:25 AM, Osier Yang wrote:
---
utils/dev_num.sh | 2 +-
utils/disk_num.sh | 2 +-
utils/ipget.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/utils/dev_num.sh b/utils/dev_num.sh
index 5e79313..552721b 100755
--- a/utils/dev_num.sh
+++ b/utils/dev_num.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# counting disk and interface numbers
guestname=$1
diff --git a/utils/disk_num.sh b/utils/disk_num.sh
index 8c10e52..57f46aa 100755
--- a/utils/disk_num.sh
+++ b/utils/disk_num.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
guestname=$1
if [[ -z $guestname ]]; then
diff --git a/utils/ipget.sh b/utils/ipget.sh
index 8d44b14..dd074be 100755
--- a/utils/ipget.sh
+++ b/utils/ipget.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
mac=$1
if [[ -z $mac ]]; then
I don't think it's right.
The /bin/sh is symbolic link to bash in most GNU/Linux.
But it could be a link to another shell (ksh, dash)
we should make the script more portable to support POSIX shell.
NACK
Guannan Ren
9:25 p.m.
New subject: [libvirt] [test-API 10/14] Substitute 'guesttype' with 'virt_type'
Also 'guest type' to 'virt type'. The principle is to use the same
TERM as libvirt, and the projects around libvirt, e.g. python-virtinst.
---
cases/consumption_cpu_topology.conf | 2 +-
cases/consumption_domain_nfs_start.conf | 2 +-
cases/consumption_eventhandler.conf | 2 +-
cases/consumption_libvirtd.conf | 2 +-
cases/consumption_ownership_test.conf | 2 +-
cases/domain_linux_net_inst.conf | 4 +-
cases/linux_domain.conf | 10 ++--
cases/migration/ssh_persistent_paused_no_dst.conf | 24 ++++----
.../migration/ssh_persistent_paused_with_dst.conf | 48 +++++++-------
cases/migration/ssh_persistent_running_no_dst.conf | 24 ++++----
.../migration/ssh_persistent_running_with_dst.conf | 48 +++++++-------
cases/migration/ssh_transient_paused_no_dst.conf | 22 ++++----
cases/migration/ssh_transient_paused_with_dst.conf | 48 +++++++-------
cases/migration/ssh_transient_running_no_dst.conf | 24 ++++----
.../migration/ssh_transient_running_with_dst.conf | 48 +++++++-------
cases/migration/tcp_persistent_paused_no_dst.conf | 24 ++++----
.../migration/tcp_persistent_paused_with_dst.conf | 48 +++++++-------
cases/migration/tcp_persistent_running_no_dst.conf | 24 ++++----
.../migration/tcp_persistent_running_with_dst.conf | 48 +++++++-------
.../tcp_sasl_persistent_paused_no_dst.conf | 8 +-
.../tcp_sasl_persistent_paused_with_dst.conf | 16 +++---
.../tcp_sasl_persistent_running_no_dst.conf | 8 +-
.../tcp_sasl_persistent_running_with_dst.conf | 16 +++---
.../tcp_sasl_transient_paused_no_dst.conf | 8 +-
.../tcp_sasl_transient_paused_with_dst.conf | 16 +++---
.../tcp_sasl_transient_running_no_dst.conf | 8 +-
.../tcp_sasl_transient_running_with_dst.conf | 16 +++---
cases/migration/tcp_transient_paused_no_dst.conf | 22 ++++----
cases/migration/tcp_transient_paused_with_dst.conf | 48 +++++++-------
cases/migration/tcp_transient_running_no_dst.conf | 24 ++++----
.../migration/tcp_transient_running_with_dst.conf | 48 +++++++-------
cases/migration/tls_persistent_paused_no_dst.conf | 24 ++++----
.../migration/tls_persistent_paused_with_dst.conf | 48 +++++++-------
cases/migration/tls_persistent_running_no_dst.conf | 24 ++++----
.../migration/tls_persistent_running_with_dst.conf | 48 +++++++-------
.../tls_sasl_persistent_paused_no_dst.conf | 8 +-
.../tls_sasl_persistent_paused_with_dst.conf | 16 +++---
.../tls_sasl_persistent_running_no_dst.conf | 8 +-
.../tls_sasl_persistent_running_with_dst.conf | 16 +++---
.../tls_sasl_transient_paused_no_dst.conf | 8 +-
.../tls_sasl_transient_paused_with_dst.conf | 16 +++---
.../tls_sasl_transient_running_no_dst.conf | 8 +-
.../tls_sasl_transient_running_with_dst.conf | 16 +++---
cases/migration/tls_transient_paused_no_dst.conf | 22 ++++----
cases/migration/tls_transient_paused_with_dst.conf | 48 +++++++-------
cases/migration/tls_transient_running_no_dst.conf | 24 ++++----
.../migration/tls_transient_running_with_dst.conf | 48 +++++++-------
cases/snapshot.conf | 2 +-
cases/windows_domain.conf | 8 +-
.../en-US/Writing_a_test_case.xml | 2 +-
repos/domain/attach_disk.py | 2 +-
repos/domain/create.py | 2 +-
repos/domain/define.py | 14 ++--
repos/domain/detach_disk.py | 2 +-
repos/domain/install_image.py | 6 +-
repos/domain/install_linux_cdrom.py | 18 +++---
repos/domain/install_linux_check.py | 8 +-
repos/domain/install_linux_net.py | 20 +++---
repos/domain/install_windows_cdrom.py | 8 +-
repos/domain/update_devflag.py | 2 +-
.../multiple_thread_block_on_domain_create.py | 6 +-
utils/xmlbuilder.py | 14 ++--
utils/xmlgenerator.py | 64 ++++++++++----------
63 files changed, 626 insertions(+), 626 deletions(-)
diff --git a/cases/consumption_cpu_topology.conf b/cases/consumption_cpu_topology.conf
index 30ab3c5..1d76256 100644
--- a/cases/consumption_cpu_topology.conf
+++ b/cases/consumption_cpu_topology.conf
@@ -1,7 +1,7 @@
domain:install_linux_cdrom
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
guestos
$defaultos
diff --git a/cases/consumption_domain_nfs_start.conf
b/cases/consumption_domain_nfs_start.conf
index d1bbc2f..f97cda0 100644
--- a/cases/consumption_domain_nfs_start.conf
+++ b/cases/consumption_domain_nfs_start.conf
@@ -1,7 +1,7 @@
domain:install_linux_cdrom
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
guestos
$defaultos
diff --git a/cases/consumption_eventhandler.conf b/cases/consumption_eventhandler.conf
index d267c83..768d616 100644
--- a/cases/consumption_eventhandler.conf
+++ b/cases/consumption_eventhandler.conf
@@ -1,7 +1,7 @@
domain:install_linux_cdrom
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
guestos
$defaultos
diff --git a/cases/consumption_libvirtd.conf b/cases/consumption_libvirtd.conf
index a69fe2e..4eb8f86 100644
--- a/cases/consumption_libvirtd.conf
+++ b/cases/consumption_libvirtd.conf
@@ -1,7 +1,7 @@
domain:install_linux_cdrom
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
guestos
$defaultos
diff --git a/cases/consumption_ownership_test.conf
b/cases/consumption_ownership_test.conf
index e1bb962..58468fd 100644
--- a/cases/consumption_ownership_test.conf
+++ b/cases/consumption_ownership_test.conf
@@ -1,7 +1,7 @@
domain:install_linux_cdrom
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
guestos
$defaultos
diff --git a/cases/domain_linux_net_inst.conf b/cases/domain_linux_net_inst.conf
index 0f1a230..4c8ab5d 100644
--- a/cases/domain_linux_net_inst.conf
+++ b/cases/domain_linux_net_inst.conf
@@ -1,7 +1,7 @@
domain:install_linux_net
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
guestos
$defaultos
@@ -23,7 +23,7 @@ domain:install_linux_net
domain:install_linux_check
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
hdmodel
$defaulthd
diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf
index b0571f1..5059c0d 100644
--- a/cases/linux_domain.conf
+++ b/cases/linux_domain.conf
@@ -1,7 +1,7 @@
domain:install_linux_cdrom
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
guestos
$defaultos
@@ -21,7 +21,7 @@ domain:install_linux_cdrom
domain:install_linux_check
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
hdmodel
$defaulthd
@@ -47,7 +47,7 @@ domain:undefine
domain:define
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
vcpu
$defaultvcpu
@@ -116,7 +116,7 @@ domain:start
domain:attach_disk
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
imagename
attacheddisk
@@ -128,7 +128,7 @@ domain:attach_disk
domain:detach_disk
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
imagename
attacheddisk
diff --git a/cases/migration/ssh_persistent_paused_no_dst.conf
b/cases/migration/ssh_persistent_paused_no_dst.conf
index 9fd098b..e236d55 100644
--- a/cases/migration/ssh_persistent_paused_no_dst.conf
+++ b/cases/migration/ssh_persistent_paused_no_dst.conf
@@ -5,7 +5,7 @@
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -43,7 +43,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -81,7 +81,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -119,7 +119,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -157,7 +157,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -195,7 +195,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -233,7 +233,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -271,7 +271,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -309,7 +309,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -347,7 +347,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -385,7 +385,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -423,7 +423,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
diff --git a/cases/migration/ssh_persistent_paused_with_dst.conf
b/cases/migration/ssh_persistent_paused_with_dst.conf
index 05f9277..8538d64 100644
--- a/cases/migration/ssh_persistent_paused_with_dst.conf
+++ b/cases/migration/ssh_persistent_paused_with_dst.conf
@@ -5,7 +5,7 @@
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -13,7 +13,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -59,7 +59,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -67,7 +67,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -113,7 +113,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -121,7 +121,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -167,7 +167,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -175,7 +175,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -221,7 +221,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -229,7 +229,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -275,7 +275,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -283,7 +283,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -329,7 +329,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -337,7 +337,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -383,7 +383,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -391,7 +391,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -437,7 +437,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -445,7 +445,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -491,7 +491,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -499,7 +499,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -545,7 +545,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -553,7 +553,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -599,7 +599,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -607,7 +607,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/ssh_persistent_running_no_dst.conf
b/cases/migration/ssh_persistent_running_no_dst.conf
index 6624718..455c16a 100644
--- a/cases/migration/ssh_persistent_running_no_dst.conf
+++ b/cases/migration/ssh_persistent_running_no_dst.conf
@@ -5,7 +5,7 @@
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -41,7 +41,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -77,7 +77,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -113,7 +113,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -149,7 +149,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -185,7 +185,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -221,7 +221,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -257,7 +257,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -293,7 +293,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -329,7 +329,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -365,7 +365,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -401,7 +401,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
diff --git a/cases/migration/ssh_persistent_running_with_dst.conf
b/cases/migration/ssh_persistent_running_with_dst.conf
index 1477d21..54f34a0 100644
--- a/cases/migration/ssh_persistent_running_with_dst.conf
+++ b/cases/migration/ssh_persistent_running_with_dst.conf
@@ -5,7 +5,7 @@
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -13,7 +13,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -57,7 +57,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -65,7 +65,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -109,7 +109,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -117,7 +117,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -161,7 +161,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -169,7 +169,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -213,7 +213,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -221,7 +221,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -265,7 +265,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -273,7 +273,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -317,7 +317,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -325,7 +325,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -369,7 +369,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -377,7 +377,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -421,7 +421,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -429,7 +429,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -473,7 +473,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -481,7 +481,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -525,7 +525,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -533,7 +533,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -577,7 +577,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -585,7 +585,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/ssh_transient_paused_no_dst.conf
b/cases/migration/ssh_transient_paused_no_dst.conf
index 88c93fd..d92f9f0 100644
--- a/cases/migration/ssh_transient_paused_no_dst.conf
+++ b/cases/migration/ssh_transient_paused_no_dst.conf
@@ -5,7 +5,7 @@
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -39,7 +39,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -73,7 +73,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -107,7 +107,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -141,7 +141,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -175,7 +175,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -209,7 +209,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -243,7 +243,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -303,7 +303,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -337,7 +337,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -371,7 +371,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
diff --git a/cases/migration/ssh_transient_paused_with_dst.conf
b/cases/migration/ssh_transient_paused_with_dst.conf
index 8236972..4119522 100644
--- a/cases/migration/ssh_transient_paused_with_dst.conf
+++ b/cases/migration/ssh_transient_paused_with_dst.conf
@@ -5,7 +5,7 @@
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -15,7 +15,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -55,7 +55,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -65,7 +65,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -105,7 +105,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -115,7 +115,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -155,7 +155,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -165,7 +165,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -205,7 +205,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -215,7 +215,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -255,7 +255,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -265,7 +265,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -305,7 +305,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -315,7 +315,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -355,7 +355,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -365,7 +365,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -405,7 +405,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -415,7 +415,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -455,7 +455,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -465,7 +465,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -505,7 +505,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -515,7 +515,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -555,7 +555,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -565,7 +565,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/ssh_transient_running_no_dst.conf
b/cases/migration/ssh_transient_running_no_dst.conf
index 7cef4c2..6556ac7 100644
--- a/cases/migration/ssh_transient_running_no_dst.conf
+++ b/cases/migration/ssh_transient_running_no_dst.conf
@@ -5,7 +5,7 @@
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -37,7 +37,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -69,7 +69,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -101,7 +101,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -133,7 +133,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -165,7 +165,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -197,7 +197,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -229,7 +229,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -261,7 +261,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -293,7 +293,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -325,7 +325,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -357,7 +357,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
diff --git a/cases/migration/ssh_transient_running_with_dst.conf
b/cases/migration/ssh_transient_running_with_dst.conf
index 68e1f6a..edeac12 100644
--- a/cases/migration/ssh_transient_running_with_dst.conf
+++ b/cases/migration/ssh_transient_running_with_dst.conf
@@ -5,7 +5,7 @@
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -13,7 +13,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -53,7 +53,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -61,7 +61,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -101,7 +101,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -109,7 +109,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -149,7 +149,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -157,7 +157,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -197,7 +197,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -205,7 +205,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -245,7 +245,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -253,7 +253,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -293,7 +293,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -301,7 +301,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -341,7 +341,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -349,7 +349,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -389,7 +389,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -397,7 +397,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -437,7 +437,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -445,7 +445,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -485,7 +485,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -493,7 +493,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -533,7 +533,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -541,7 +541,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/tcp_persistent_paused_no_dst.conf
b/cases/migration/tcp_persistent_paused_no_dst.conf
index 5a4fe63..19c9857 100644
--- a/cases/migration/tcp_persistent_paused_no_dst.conf
+++ b/cases/migration/tcp_persistent_paused_no_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tcp_setup
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -55,7 +55,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -93,7 +93,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -131,7 +131,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -169,7 +169,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -207,7 +207,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -245,7 +245,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -283,7 +283,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -321,7 +321,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -359,7 +359,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -397,7 +397,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -435,7 +435,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
diff --git a/cases/migration/tcp_persistent_paused_with_dst.conf
b/cases/migration/tcp_persistent_paused_with_dst.conf
index 72934dc..9d978d6 100644
--- a/cases/migration/tcp_persistent_paused_with_dst.conf
+++ b/cases/migration/tcp_persistent_paused_with_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tcp_setup
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -25,7 +25,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -71,7 +71,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -79,7 +79,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -125,7 +125,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -133,7 +133,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -179,7 +179,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -187,7 +187,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -233,7 +233,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -241,7 +241,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -287,7 +287,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -295,7 +295,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -341,7 +341,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -349,7 +349,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -395,7 +395,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -403,7 +403,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -449,7 +449,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -457,7 +457,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -503,7 +503,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -511,7 +511,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -557,7 +557,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -565,7 +565,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -611,7 +611,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -619,7 +619,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/tcp_persistent_running_no_dst.conf
b/cases/migration/tcp_persistent_running_no_dst.conf
index f01352b..bea8ef6 100644
--- a/cases/migration/tcp_persistent_running_no_dst.conf
+++ b/cases/migration/tcp_persistent_running_no_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tcp_setup
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -53,7 +53,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -89,7 +89,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -125,7 +125,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -161,7 +161,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -197,7 +197,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -233,7 +233,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -269,7 +269,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -305,7 +305,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -341,7 +341,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -377,7 +377,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -413,7 +413,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
diff --git a/cases/migration/tcp_persistent_running_with_dst.conf
b/cases/migration/tcp_persistent_running_with_dst.conf
index d45c90b..236377f 100644
--- a/cases/migration/tcp_persistent_running_with_dst.conf
+++ b/cases/migration/tcp_persistent_running_with_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tcp_setup
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -25,7 +25,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -69,7 +69,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -77,7 +77,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -121,7 +121,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -129,7 +129,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -173,7 +173,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -181,7 +181,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -225,7 +225,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -233,7 +233,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -277,7 +277,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -285,7 +285,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -329,7 +329,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -337,7 +337,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -381,7 +381,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -389,7 +389,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -433,7 +433,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -441,7 +441,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -485,7 +485,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -493,7 +493,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -537,7 +537,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -545,7 +545,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -589,7 +589,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -597,7 +597,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/tcp_sasl_persistent_paused_no_dst.conf
b/cases/migration/tcp_sasl_persistent_paused_no_dst.conf
index b3e7115..c4fe3ee 100644
--- a/cases/migration/tcp_sasl_persistent_paused_no_dst.conf
+++ b/cases/migration/tcp_sasl_persistent_paused_no_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tcp_setup
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -55,7 +55,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -93,7 +93,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -131,7 +131,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
diff --git a/cases/migration/tcp_sasl_persistent_paused_with_dst.conf
b/cases/migration/tcp_sasl_persistent_paused_with_dst.conf
index 34b9e28..0b785a7 100644
--- a/cases/migration/tcp_sasl_persistent_paused_with_dst.conf
+++ b/cases/migration/tcp_sasl_persistent_paused_with_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tcp_setup
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -25,7 +25,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -71,7 +71,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -79,7 +79,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -125,7 +125,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -133,7 +133,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -179,7 +179,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -187,7 +187,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/tcp_sasl_persistent_running_no_dst.conf
b/cases/migration/tcp_sasl_persistent_running_no_dst.conf
index 00740dc..ff10eeb 100644
--- a/cases/migration/tcp_sasl_persistent_running_no_dst.conf
+++ b/cases/migration/tcp_sasl_persistent_running_no_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tcp_setup
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -53,7 +53,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -89,7 +89,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -125,7 +125,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
diff --git a/cases/migration/tcp_sasl_persistent_running_with_dst.conf
b/cases/migration/tcp_sasl_persistent_running_with_dst.conf
index 0e8c348..f5629ae 100644
--- a/cases/migration/tcp_sasl_persistent_running_with_dst.conf
+++ b/cases/migration/tcp_sasl_persistent_running_with_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tcp_setup
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -25,7 +25,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -69,7 +69,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -77,7 +77,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -121,7 +121,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -129,7 +129,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -173,7 +173,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -181,7 +181,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/tcp_sasl_transient_paused_no_dst.conf
b/cases/migration/tcp_sasl_transient_paused_no_dst.conf
index 00b2c3c..cc31768 100644
--- a/cases/migration/tcp_sasl_transient_paused_no_dst.conf
+++ b/cases/migration/tcp_sasl_transient_paused_no_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tcp_setup
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -51,7 +51,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -85,7 +85,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -119,7 +119,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
diff --git a/cases/migration/tcp_sasl_transient_paused_with_dst.conf
b/cases/migration/tcp_sasl_transient_paused_with_dst.conf
index eecb8e0..933578c 100644
--- a/cases/migration/tcp_sasl_transient_paused_with_dst.conf
+++ b/cases/migration/tcp_sasl_transient_paused_with_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tcp_setup
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -27,7 +27,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -67,7 +67,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -77,7 +77,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -117,7 +117,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -127,7 +127,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -167,7 +167,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -177,7 +177,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/tcp_sasl_transient_running_no_dst.conf
b/cases/migration/tcp_sasl_transient_running_no_dst.conf
index 89b7348..3c73997 100644
--- a/cases/migration/tcp_sasl_transient_running_no_dst.conf
+++ b/cases/migration/tcp_sasl_transient_running_no_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tcp_setup
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -49,7 +49,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -81,7 +81,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -113,7 +113,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
diff --git a/cases/migration/tcp_sasl_transient_running_with_dst.conf
b/cases/migration/tcp_sasl_transient_running_with_dst.conf
index 0005780..fea96ff 100644
--- a/cases/migration/tcp_sasl_transient_running_with_dst.conf
+++ b/cases/migration/tcp_sasl_transient_running_with_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tcp_setup
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -25,7 +25,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -65,7 +65,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -73,7 +73,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -113,7 +113,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -121,7 +121,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -161,7 +161,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -169,7 +169,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/tcp_transient_paused_no_dst.conf
b/cases/migration/tcp_transient_paused_no_dst.conf
index 164cbde..494bf2b 100644
--- a/cases/migration/tcp_transient_paused_no_dst.conf
+++ b/cases/migration/tcp_transient_paused_no_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tcp_setup
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -51,7 +51,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -85,7 +85,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -119,7 +119,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -153,7 +153,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -187,7 +187,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -221,7 +221,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -255,7 +255,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -315,7 +315,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -349,7 +349,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -383,7 +383,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
diff --git a/cases/migration/tcp_transient_paused_with_dst.conf
b/cases/migration/tcp_transient_paused_with_dst.conf
index 95a06c8..15b3607 100644
--- a/cases/migration/tcp_transient_paused_with_dst.conf
+++ b/cases/migration/tcp_transient_paused_with_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tcp_setup
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -27,7 +27,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -67,7 +67,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -77,7 +77,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -117,7 +117,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -127,7 +127,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -167,7 +167,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -177,7 +177,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -217,7 +217,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -227,7 +227,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -267,7 +267,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -277,7 +277,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -317,7 +317,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -327,7 +327,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -367,7 +367,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -377,7 +377,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -417,7 +417,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -427,7 +427,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -467,7 +467,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -477,7 +477,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -517,7 +517,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -527,7 +527,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -567,7 +567,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -577,7 +577,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/tcp_transient_running_no_dst.conf
b/cases/migration/tcp_transient_running_no_dst.conf
index e86e74e..246e5e4 100644
--- a/cases/migration/tcp_transient_running_no_dst.conf
+++ b/cases/migration/tcp_transient_running_no_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tcp_setup
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -49,7 +49,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -81,7 +81,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -113,7 +113,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -145,7 +145,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -177,7 +177,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -209,7 +209,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -241,7 +241,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -273,7 +273,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -305,7 +305,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -337,7 +337,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -369,7 +369,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
diff --git a/cases/migration/tcp_transient_running_with_dst.conf
b/cases/migration/tcp_transient_running_with_dst.conf
index 5a6dc43..b20b1fe 100644
--- a/cases/migration/tcp_transient_running_with_dst.conf
+++ b/cases/migration/tcp_transient_running_with_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tcp_setup
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -25,7 +25,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -65,7 +65,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -73,7 +73,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -113,7 +113,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -121,7 +121,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -161,7 +161,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -169,7 +169,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -209,7 +209,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -217,7 +217,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -257,7 +257,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -265,7 +265,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -305,7 +305,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -313,7 +313,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -353,7 +353,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -361,7 +361,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -401,7 +401,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -409,7 +409,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -449,7 +449,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -457,7 +457,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -497,7 +497,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -505,7 +505,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -545,7 +545,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -553,7 +553,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/tls_persistent_paused_no_dst.conf
b/cases/migration/tls_persistent_paused_no_dst.conf
index f22e0ac..43b9147 100644
--- a/cases/migration/tls_persistent_paused_no_dst.conf
+++ b/cases/migration/tls_persistent_paused_no_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tls_setup
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -55,7 +55,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -93,7 +93,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -131,7 +131,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -169,7 +169,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -207,7 +207,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -245,7 +245,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -283,7 +283,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -321,7 +321,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -359,7 +359,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -397,7 +397,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -435,7 +435,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
diff --git a/cases/migration/tls_persistent_paused_with_dst.conf
b/cases/migration/tls_persistent_paused_with_dst.conf
index 93665da..f6faa74 100644
--- a/cases/migration/tls_persistent_paused_with_dst.conf
+++ b/cases/migration/tls_persistent_paused_with_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tls_setup
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -25,7 +25,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -71,7 +71,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -79,7 +79,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -125,7 +125,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -133,7 +133,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -179,7 +179,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -187,7 +187,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -233,7 +233,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -241,7 +241,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -287,7 +287,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -295,7 +295,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -341,7 +341,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -349,7 +349,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -395,7 +395,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -403,7 +403,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -449,7 +449,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -457,7 +457,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -503,7 +503,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -511,7 +511,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -557,7 +557,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -565,7 +565,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -611,7 +611,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -619,7 +619,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/tls_persistent_running_no_dst.conf
b/cases/migration/tls_persistent_running_no_dst.conf
index 31a1bec..708f406 100644
--- a/cases/migration/tls_persistent_running_no_dst.conf
+++ b/cases/migration/tls_persistent_running_no_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tls_setup
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -53,7 +53,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -89,7 +89,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -125,7 +125,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -161,7 +161,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -197,7 +197,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -233,7 +233,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -269,7 +269,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -305,7 +305,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -341,7 +341,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -377,7 +377,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -413,7 +413,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
diff --git a/cases/migration/tls_persistent_running_with_dst.conf
b/cases/migration/tls_persistent_running_with_dst.conf
index 981baec..05b0170 100644
--- a/cases/migration/tls_persistent_running_with_dst.conf
+++ b/cases/migration/tls_persistent_running_with_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tls_setup
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -25,7 +25,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -69,7 +69,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -77,7 +77,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -121,7 +121,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -129,7 +129,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -173,7 +173,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -181,7 +181,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -225,7 +225,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -233,7 +233,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -277,7 +277,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -285,7 +285,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -329,7 +329,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -337,7 +337,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -381,7 +381,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -389,7 +389,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -433,7 +433,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -441,7 +441,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -485,7 +485,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -493,7 +493,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -537,7 +537,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -545,7 +545,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -589,7 +589,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -597,7 +597,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/tls_sasl_persistent_paused_no_dst.conf
b/cases/migration/tls_sasl_persistent_paused_no_dst.conf
index 6826eb1..96a4187 100644
--- a/cases/migration/tls_sasl_persistent_paused_no_dst.conf
+++ b/cases/migration/tls_sasl_persistent_paused_no_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tls_setup
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -55,7 +55,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -93,7 +93,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -131,7 +131,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
diff --git a/cases/migration/tls_sasl_persistent_paused_with_dst.conf
b/cases/migration/tls_sasl_persistent_paused_with_dst.conf
index 16024e7..5d9f13a 100644
--- a/cases/migration/tls_sasl_persistent_paused_with_dst.conf
+++ b/cases/migration/tls_sasl_persistent_paused_with_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tls_setup
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -25,7 +25,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -71,7 +71,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -79,7 +79,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -125,7 +125,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -133,7 +133,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -179,7 +179,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -187,7 +187,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/tls_sasl_persistent_running_no_dst.conf
b/cases/migration/tls_sasl_persistent_running_no_dst.conf
index 6ab4a3f..6a1f844 100644
--- a/cases/migration/tls_sasl_persistent_running_no_dst.conf
+++ b/cases/migration/tls_sasl_persistent_running_no_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tls_setup
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -53,7 +53,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -89,7 +89,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -125,7 +125,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:start
diff --git a/cases/migration/tls_sasl_persistent_running_with_dst.conf
b/cases/migration/tls_sasl_persistent_running_with_dst.conf
index 6f40f46..3cc7493 100644
--- a/cases/migration/tls_sasl_persistent_running_with_dst.conf
+++ b/cases/migration/tls_sasl_persistent_running_with_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tls_setup
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -25,7 +25,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -69,7 +69,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -77,7 +77,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -121,7 +121,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -129,7 +129,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -173,7 +173,7 @@ domain:migrate
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -181,7 +181,7 @@ domain:define
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/tls_sasl_transient_paused_no_dst.conf
b/cases/migration/tls_sasl_transient_paused_no_dst.conf
index efdbe4c..e080d07 100644
--- a/cases/migration/tls_sasl_transient_paused_no_dst.conf
+++ b/cases/migration/tls_sasl_transient_paused_no_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tls_setup
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -51,7 +51,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -85,7 +85,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -119,7 +119,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
diff --git a/cases/migration/tls_sasl_transient_paused_with_dst.conf
b/cases/migration/tls_sasl_transient_paused_with_dst.conf
index 1147fc1..7a8c66f 100644
--- a/cases/migration/tls_sasl_transient_paused_with_dst.conf
+++ b/cases/migration/tls_sasl_transient_paused_with_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tls_setup
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -27,7 +27,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -67,7 +67,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -77,7 +77,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -117,7 +117,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -127,7 +127,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -167,7 +167,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -177,7 +177,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/tls_sasl_transient_running_no_dst.conf
b/cases/migration/tls_sasl_transient_running_no_dst.conf
index afd4930..df9c03a 100644
--- a/cases/migration/tls_sasl_transient_running_no_dst.conf
+++ b/cases/migration/tls_sasl_transient_running_no_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tls_setup
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -49,7 +49,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -81,7 +81,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -113,7 +113,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
diff --git a/cases/migration/tls_sasl_transient_running_with_dst.conf
b/cases/migration/tls_sasl_transient_running_with_dst.conf
index e1231d6..a8c70c7 100644
--- a/cases/migration/tls_sasl_transient_running_with_dst.conf
+++ b/cases/migration/tls_sasl_transient_running_with_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tls_setup
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -25,7 +25,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -65,7 +65,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -73,7 +73,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -113,7 +113,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -121,7 +121,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -161,7 +161,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -169,7 +169,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/tls_transient_paused_no_dst.conf
b/cases/migration/tls_transient_paused_no_dst.conf
index e0bd483..b033f92 100644
--- a/cases/migration/tls_transient_paused_no_dst.conf
+++ b/cases/migration/tls_transient_paused_no_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tls_setup
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -51,7 +51,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -85,7 +85,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -119,7 +119,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -153,7 +153,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -187,7 +187,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -221,7 +221,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -255,7 +255,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -315,7 +315,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -349,7 +349,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -383,7 +383,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
diff --git a/cases/migration/tls_transient_paused_with_dst.conf
b/cases/migration/tls_transient_paused_with_dst.conf
index a55bf95..45e2c04 100644
--- a/cases/migration/tls_transient_paused_with_dst.conf
+++ b/cases/migration/tls_transient_paused_with_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tls_setup
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -27,7 +27,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -67,7 +67,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -77,7 +77,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -117,7 +117,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -127,7 +127,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -167,7 +167,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -177,7 +177,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -217,7 +217,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -227,7 +227,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -267,7 +267,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -277,7 +277,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -317,7 +317,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -327,7 +327,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -367,7 +367,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -377,7 +377,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -417,7 +417,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -427,7 +427,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -467,7 +467,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -477,7 +477,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -517,7 +517,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -527,7 +527,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -567,7 +567,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
flags
start_paused
@@ -577,7 +577,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/migration/tls_transient_running_no_dst.conf
b/cases/migration/tls_transient_running_no_dst.conf
index ad4d3da..ac84c04 100644
--- a/cases/migration/tls_transient_running_no_dst.conf
+++ b/cases/migration/tls_transient_running_no_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tls_setup
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -49,7 +49,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -81,7 +81,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -113,7 +113,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -145,7 +145,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -177,7 +177,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -209,7 +209,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -241,7 +241,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -273,7 +273,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -305,7 +305,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -337,7 +337,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
@@ -369,7 +369,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
domain:migrate
diff --git a/cases/migration/tls_transient_running_with_dst.conf
b/cases/migration/tls_transient_running_with_dst.conf
index b6bee3f..c628f21 100644
--- a/cases/migration/tls_transient_running_with_dst.conf
+++ b/cases/migration/tls_transient_running_with_dst.conf
@@ -17,7 +17,7 @@ remoteAccess:tls_setup
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -25,7 +25,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -65,7 +65,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -73,7 +73,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -113,7 +113,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -121,7 +121,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -161,7 +161,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -169,7 +169,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -209,7 +209,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -217,7 +217,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -257,7 +257,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -265,7 +265,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -305,7 +305,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -313,7 +313,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -353,7 +353,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -361,7 +361,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -401,7 +401,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -409,7 +409,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -449,7 +449,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -457,7 +457,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -497,7 +497,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -505,7 +505,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -545,7 +545,7 @@ domain:migrate
domain:create
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
@@ -553,7 +553,7 @@ domain:create
domain:define
guestname
$defaultos
- guesttype
+ virt_type
$defaulthv
uuid
$static_uuid
diff --git a/cases/snapshot.conf b/cases/snapshot.conf
index ca5de99..0557c86 100644
--- a/cases/snapshot.conf
+++ b/cases/snapshot.conf
@@ -1,7 +1,7 @@
domain:install_linux_cdrom
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
guestos
$defaultos
diff --git a/cases/windows_domain.conf b/cases/windows_domain.conf
index 7b1a035..6eed3f5 100644
--- a/cases/windows_domain.conf
+++ b/cases/windows_domain.conf
@@ -1,7 +1,7 @@
domain:install_windows_cdrom
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
guestos
$defaultos
@@ -35,7 +35,7 @@ domain:undefine
domain:define
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
domain:start
@@ -93,7 +93,7 @@ domain:start
domain:attach_disk
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
imagename
attacheddisk
@@ -105,7 +105,7 @@ domain:attach_disk
domain:detach_disk
guestname
$defaultname
- guesttype
+ virt_type
$defaulthv
imagename
attacheddisk
diff --git a/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml
b/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml
index 3dd714e..21c4ac6 100644
--- a/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml
+++ b/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml
@@ -108,7 +108,7 @@ storage:initialize_storage
domain:install_guest
guestname
rhel5u4
- guesttype
+ virt_type
xenfv
memory
1048576
diff --git a/repos/domain/attach_disk.py b/repos/domain/attach_disk.py
index d68d87b..fc0e611 100644
--- a/repos/domain/attach_disk.py
+++ b/repos/domain/attach_disk.py
@@ -15,7 +15,7 @@ from utils import utils
from utils import xmlbuilder
required_params = ('guestname',
- 'guesttype',
+ 'virt_type',
'imagename',
'imagesize',
'hdmodel',)
diff --git a/repos/domain/create.py b/repos/domain/create.py
index 703ec3e..9f2f5e1 100644
--- a/repos/domain/create.py
+++ b/repos/domain/create.py
@@ -16,7 +16,7 @@ from utils import xmlbuilder
NONE = 0
START_PAUSED = 1
-required_params = ('guestname', 'guesttype',)
+required_params = ('guestname', 'virt_type',)
optional_params = ('uuid',
'memory',
'vcpu',
diff --git a/repos/domain/define.py b/repos/domain/define.py
index c8fe20e..dae1062 100644
--- a/repos/domain/define.py
+++ b/repos/domain/define.py
@@ -14,7 +14,7 @@ from src import sharedmod
from utils import utils
from utils import xmlbuilder
-required_params = ('guestname', 'guesttype',)
+required_params = ('guestname', 'virt_type',)
optional_params = ('uuid',
'memory',
'vcpu',
@@ -27,18 +27,18 @@ optional_params = ('uuid',
'ifacetype',
'source',)
-def check_define_domain(guestname, guesttype, hostname, username, \
+def check_define_domain(guestname, virt_type, hostname, username, \
password, util, logger):
"""Check define domain result, if define domain is successful,
guestname.xml will exist under /etc/libvirt/qemu/
and can use virt-xml-validate tool to check the file validity
"""
- if "kvm" in guesttype:
+ if "kvm" in virt_type:
path = "/etc/libvirt/qemu/%s.xml" % guestname
- elif "xen" in guesttype:
+ elif "xen" in virt_type:
path = "/etc/xen/%s" % guestname
else:
- logger.error("unknown guest type")
+ logger.error("unknown virt type")
if hostname:
cmd = "ls %s" % path
@@ -59,7 +59,7 @@ def define(params):
"""Define a domain from xml"""
logger = params['logger']
guestname = params['guestname']
- guesttype = params['guesttype']
+ virt_type = params['virt_type']
conn = sharedmod.libvirtobj['conn']
uri = conn.getURI()
@@ -80,7 +80,7 @@ def define(params):
# Define domain from xml
try:
conn.defineXML(dom_xml)
- if check_define_domain(guestname, guesttype, hostname, \
+ if check_define_domain(guestname, virt_type, hostname, \
username, password, util, logger):
logger.info("define a domain form xml is successful")
else:
diff --git a/repos/domain/detach_disk.py b/repos/domain/detach_disk.py
index 2ebf66e..da25c8f 100644
--- a/repos/domain/detach_disk.py
+++ b/repos/domain/detach_disk.py
@@ -13,7 +13,7 @@ from src import sharedmod
from utils import utils
from utils import xmlbuilder
-required_params = ('guestname', 'guesttype', 'imagename',
'hdmodel',)
+required_params = ('guestname', 'virt_type', 'imagename',
'hdmodel',)
optional_params = ()
def check_guest_status(domobj):
diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py
index 89b7e40..2ab97a0 100644
--- a/repos/domain/install_image.py
+++ b/repos/domain/install_image.py
@@ -17,7 +17,7 @@ from utils import xmlbuilder
HOME_PATH = os.getcwd()
-required_params = ('guestname', 'guesttype', 'guestos',
'guestarch',)
+required_params = ('guestname', 'virt_type', 'guestos',
'guestarch',)
optional_params = ('uuid',
'memory',
'vcpu',
@@ -34,12 +34,12 @@ def install_image(params):
params.pop('logger')
guestname = params.get('guestname')
- guesttype = params.get('guesttype')
+ virt_type = params.get('virt_type')
guestos = params.get('guestos')
guestarch = params.get('guestarch')
logger.info("the name of guest is %s" % guestname)
- logger.info("the type of guest is %s" % guesttype)
+ logger.info("the type of guest is %s" % virt_type)
logger.info("the os of guest is %s" % guestos)
logger.info("the arch of guest is %s" % guestarch)
diff --git a/repos/domain/install_linux_cdrom.py b/repos/domain/install_linux_cdrom.py
index 342ed84..235f587 100644
--- a/repos/domain/install_linux_cdrom.py
+++ b/repos/domain/install_linux_cdrom.py
@@ -18,7 +18,7 @@ from src import env_parser
from utils import utils
from utils import xmlbuilder
-required_params = ('guestname', 'guesttype', 'guestos',
'guestarch',)
+required_params = ('guestname', 'virt_type', 'guestos',
'guestarch',)
optional_params = ('uuid',
'memory',
'vcpu',
@@ -159,12 +159,12 @@ def install_linux_cdrom(params):
params.pop('logger')
guestname = params.get('guestname')
- guesttype = params.get('guesttype')
+ virt_type = params.get('virt_type')
guestos = params.get('guestos')
guestarch = params.get('guestarch')
logger.info("the name of guest is %s" % guestname)
- logger.info("the type of guest is %s" % guesttype)
+ logger.info("the type of guest is %s" % virt_type)
hypervisor = utils.get_hypervisor()
conn = sharedmod.libvirtobj['conn']
@@ -235,7 +235,7 @@ def install_linux_cdrom(params):
logger.info('prepare installation...')
- if guesttype == 'xenpv':
+ if virt_type == 'xenpv':
params['kickstart'] = ks
vmlinuzpath = os.path.join(ostree, 'isolinux/vmlinuz')
initrdpath = os.path.join(ostree, 'isolinux/initrd.img')
@@ -248,14 +248,14 @@ def install_linux_cdrom(params):
logger.debug("vmlinuz and initrd.img is located in %s" % BOOT_DIR)
- elif guesttype == 'xenfv' or guesttype == 'kvm':
+ elif virt_type == 'xenfv' or virt_type == 'kvm':
params['bootcd'] = '%s/custom.iso' % \
(os.path.join(HOME_PATH, guestname))
logger.debug("the bootcd path is %s" % params['bootcd'])
logger.info("begin to customize the custom.iso file")
prepare_cdrom(ostree, ks, guestname, logger)
else:
- logger.error("unknown guest type: %s" % guesttype)
+ logger.error("unknown virt type: %s" % virt_type)
return 1
xmlobj = xmlbuilder.XmlBuilder()
@@ -375,7 +375,7 @@ def install_linux_cdrom_clean(params):
""" clean testing environment """
logger = params['logger']
guestname = params.get('guestname')
- guesttype = params.get('guesttype')
+ virt_type = params.get('virt_type')
hypervisor = utils.get_hypervisor()
if hypervisor == 'xen':
@@ -408,14 +408,14 @@ def install_linux_cdrom_clean(params):
if os.path.exists(imgfullpath):
os.remove(imgfullpath)
- if guesttype == 'xenpv':
+ if virt_type == 'xenpv':
vmlinuz = os.path.join(BOOT_DIR, 'vmlinuz')
initrd = os.path.join(BOOT_DIR, 'initrd.img')
if os.path.exists(vmlinuz):
os.remove(vmlinuz)
if os.path.exists(initrd):
os.remove(initrd)
- elif guesttype == 'xenfv' or guesttype == 'kvm':
+ elif virt_type == 'xenfv' or virt_type == 'kvm':
guest_dir = os.path.join(HOME_PATH, guestname)
if os.path.exists(guest_dir):
shutil.rmtree(guest_dir)
diff --git a/repos/domain/install_linux_check.py b/repos/domain/install_linux_check.py
index f4d04d9..303ab7f 100644
--- a/repos/domain/install_linux_check.py
+++ b/repos/domain/install_linux_check.py
@@ -15,11 +15,11 @@ from src import sharedmod
from src import env_parser
from utils import utils
-required_params = ('guestname', 'guesttype', 'hdmodel',
'nicmodel',)
+required_params = ('guestname', 'virt_type', 'hdmodel',
'nicmodel',)
optional_params = ('disksize',
'memory',
'vcpu',
- 'guesttype',
+ 'virt_type',
'imagepath',
'ifacetype',
'netmethod',
@@ -37,7 +37,7 @@ def install_linux_check(params):
params.pop('logger')
guestname = params.get('guestname')
- guesttype = params.get('guesttype')
+ virt_type = params.get('virt_type')
logger.info("the name of guest is %s" % guestname)
@@ -162,7 +162,7 @@ def install_linux_check(params):
return Test_Result
# Check nic and blk driver in guest
- if 'kvm' in guesttype or 'xenfv' in guesttype:
+ if 'kvm' in virt_type or 'xenfv' in virt_type:
logger.info("check point6: check nic and blk driver in guest is \
expected as your config:")
if utils.validate_remote_nic_type(ipaddr, "root", "redhat",
diff --git a/repos/domain/install_linux_net.py b/repos/domain/install_linux_net.py
index 8c8931d..9841eed 100644
--- a/repos/domain/install_linux_net.py
+++ b/repos/domain/install_linux_net.py
@@ -18,7 +18,7 @@ from src import env_parser
from utils import utils
from utils import xmlbuilder
-required_params = ('guestname', 'guesttype', 'guestos',
'guestarch','netmethod',)
+required_params = ('guestname', 'virt_type', 'guestos',
'guestarch','netmethod',)
optional_params = ('uuid',
'memory',
'vcpu',
@@ -135,13 +135,13 @@ def install_linux_net(params):
params.pop('logger')
guestname = params.get('guestname')
- guesttype = params.get('guesttype')
+ virt_type = params.get('virt_type')
guestos = params.get('guestos')
guestarch = params.get('guestarch')
installmethod = params.get('netmethod')
logger.info("the name of guest is %s" % guestname)
- logger.info("the type of guest is %s" % guesttype)
+ logger.info("the type of guest is %s" % virt_type)
logger.info("the installation method is %s" % installmethod)
hypervisor = utils.get_hypervisor()
@@ -211,11 +211,11 @@ def install_linux_net(params):
logger.info('prepare installation...')
- if guesttype == 'xenpv' or guesttype == 'kvm':
+ if virt_type == 'xenpv' or virt_type == 'kvm':
params['kickstart'] = ks
params['macaddr'] = macaddr
- if guesttype == 'kvm':
+ if virt_type == 'kvm':
vmlinuzpath = os.path.join(ostree, 'isolinux/vmlinuz')
initrdpath = os.path.join(ostree, 'isolinux/initrd.img')
else:
@@ -230,14 +230,14 @@ def install_linux_net(params):
logger.debug("vmlinuz file is located in /var/lib/libvirt/boot")
logger.debug("initrd file is located in /var/lib/libvirt/boot")
- elif guesttype == 'xenfv':
+ elif virt_type == 'xenfv':
params['bootcd'] = '%s/custom.iso' % \
(os.path.join(HOME_PATH, guestname))
logger.debug("the bootcd path is %s" % params['bootcd'])
logger.info("begin to customize the custom.iso file")
prepare_cdrom(ostree, ks, guestname, logger)
else:
- logger.error("unknown guest type %s" % guesttype)
+ logger.error("unknown virt type %s" % virt_type)
# Prepare guest installation xml
xmlobj = xmlbuilder.XmlBuilder()
@@ -365,7 +365,7 @@ def install_linux_net_clean(params):
""" clean testing environment """
logger = params['logger']
guestname = params.get('guestname')
- guesttype = params.get('guesttype')
+ virt_type = params.get('virt_type')
hypervisor = utils.get_hypervisor()
if hypervisor == 'xen':
@@ -398,14 +398,14 @@ def install_linux_net_clean(params):
if os.path.exists(imgfullpath):
os.remove(imgfullpath)
- if guesttype == 'xenpv' or guesttype == 'kvm':
+ if virt_type == 'xenpv' or virt_type == 'kvm':
vmlinuz = os.path.join(BOOT_DIR, 'vmlinuz')
initrd = os.path.join(BOOT_DIR, 'initrd.img')
if os.path.exists(vmlinuz):
os.remove(vmlinuz)
if os.path.exists(initrd):
os.remove(initrd)
- elif guesttype == 'xenfv':
+ elif virt_type == 'xenfv':
guest_dir = os.path.join(HOME_PATH, guestname)
if os.path.exists(guest_dir):
shutil.rmtree(guest_dir)
diff --git a/repos/domain/install_windows_cdrom.py
b/repos/domain/install_windows_cdrom.py
index 652e721..6cec08a 100644
--- a/repos/domain/install_windows_cdrom.py
+++ b/repos/domain/install_windows_cdrom.py
@@ -26,7 +26,7 @@ FLOOPY_IMG = "/tmp/floppy.img"
ISO_MOUNT_POINT = "/mnt/libvirt_windows"
HOME_PATH = os.getcwd()
-required_params = ('guestname', 'guesttype', 'guestos',
'guestarch',)
+required_params = ('guestname', 'virt_type', 'guestos',
'guestarch',)
optional_params = ('uuid',
'memory',
'vcpu',
@@ -196,12 +196,12 @@ def install_windows_cdrom(params):
params.pop('logger')
guestname = params.get('guestname')
- guesttype = params.get('guesttype')
+ virt_type = params.get('virt_type')
guestos = params.get('guestos')
guestarch = params.get('guestarch')
logger.info("the name of guest is %s" % guestname)
- logger.info("the type of guest is %s" % guesttype)
+ logger.info("the type of guest is %s" % virt_type)
hypervisor = utils.get_hypervisor()
@@ -394,7 +394,7 @@ def install_windows_cdrom_clean(params):
""" clean testing environment """
logger = params['logger']
guestname = params.get('guestname')
- guesttype = params.get('guesttype')
+ virt_type = params.get('virt_type')
hypervisor = utils.get_hypervisor()
if hypervisor == 'xen':
diff --git a/repos/domain/update_devflag.py b/repos/domain/update_devflag.py
index e1b2cee..9286918 100644
--- a/repos/domain/update_devflag.py
+++ b/repos/domain/update_devflag.py
@@ -150,7 +150,7 @@ def update_devflag(params):
if devtype == 'cdrom':
xmlargs = {}
xmlargs['guestname'] = guestname
- xmlargs['guesttype'] = 'kvm'
+ xmlargs['virt_type'] = 'kvm'
xmlargs['hdmodel'] = 'ide'
xmlargs['bootcd'] = '/var/lib/libvirt/boot/cdrom.img'
srcfile = xmlargs['bootcd']
diff --git a/repos/regression/multiple_thread_block_on_domain_create.py
b/repos/regression/multiple_thread_block_on_domain_create.py
index ffd25e8..a72fdaf 100644
--- a/repos/regression/multiple_thread_block_on_domain_create.py
+++ b/repos/regression/multiple_thread_block_on_domain_create.py
@@ -21,7 +21,7 @@ from utils import xmlbuilder
IMAG_PATH = "/var/lib/libvirt/images/"
DISK_DD = "dd if=/dev/zero of=%s bs=1 count=1 seek=6G"
-required_params = ('guestos', 'guestarch', 'guesttype',
'guestnum', 'uri')
+required_params = ('guestos', 'guestarch', 'virt_type',
'guestnum', 'uri')
optional_params = ()
def request_credentials(credentials, user_data):
@@ -62,7 +62,7 @@ class guest_install(Thread):
def run(self):
guest_params = {};
- guest_params['guesttype'] = self.type
+ guest_params['virt_type'] = self.type
guest_params['guestname'] = self.name
guest_params['kickstart'] = self.ks
macaddr = self.utils.get_rand_mac()
@@ -98,7 +98,7 @@ def multiple_thread_block_on_domain_create(params):
logger = params['logger']
guestos = params.get('guestos')
arch = params.get('guestarch')
- type = params.get('guesttype')
+ type = params.get('virt_type')
num = params.get('guestnum')
logger.info("the os of guest is %s" % guestos)
diff --git a/utils/xmlbuilder.py b/utils/xmlbuilder.py
index d2ce6bb..85cda03 100644
--- a/utils/xmlbuilder.py
+++ b/utils/xmlbuilder.py
@@ -67,7 +67,7 @@ class XmlBuilder:
def build_domain_install(self, params):
domain = xmlgenerator.domain_xml(params, True)
self.add_disk(params, domain)
- if params['guesttype'] != 'xenpv':
+ if params['virt_type'] != 'xenpv':
if params.has_key('bootcd'):
self.add_cdrom(params, domain)
self.add_interface(params, domain)
@@ -103,7 +103,7 @@ class XmlBuilder:
print 'Wrong harddisk model.'
disk = xmlgenerator.disk_xml(params)
- if params['guesttype'] == 'xenpv':
+ if params['virt_type'] == 'xenpv':
disk.getElementsByTagName("target")[0].setAttribute("dev",
"xvdb")
else:
disk.getElementsByTagName("target")[0].setAttribute("dev",
@@ -124,7 +124,7 @@ class XmlBuilder:
print 'Wrong cdrom model.'
cdrom = xmlgenerator.disk_xml(params, True)
- if params['guesttype'] == 'xenpv':
+ if params['virt_type'] == 'xenpv':
cdrom.getElementsByTagName("target")[0].setAttribute("dev",
"xvdc")
else:
cdrom.getElementsByTagName("target")[0].setAttribute("dev",
@@ -202,7 +202,7 @@ if __name__ == "__main__":
# get disk xml string
#---------------------
print '=' * 30, 'disk xml', '=' * 30
- params['guesttype'] = 'kvm'
+ params['virt_type'] = 'kvm'
params['guestname'] = 'foo'
params['hdmodel'] = 'virtio'
@@ -212,7 +212,7 @@ if __name__ == "__main__":
# get cdrom xml string
#---------------------
print '=' * 30, 'cdrom xml', '=' * 30
- params['guesttype'] = 'kvm'
+ params['virt_type'] = 'kvm'
params['guestname'] = 'foo'
params['hdmodel'] = 'ide'
params['bootcd'] = '/tmp/cdrom.img'
@@ -292,7 +292,7 @@ if __name__ == "__main__":
# get domain xml string
#-----------------------
print '=' * 30, 'domain xml', '=' * 30
- params['guesttype'] = 'kvm'
+ params['virt_type'] = 'kvm'
params['guestname'] = 'rhel5u4'
params['memory'] = '1048576'
params['vcpu'] = '2'
@@ -321,7 +321,7 @@ if __name__ == "__main__":
# get domain xml string for installation
#----------------------------------------
print '=' * 30, 'install domain xml', '=' * 30
- params['guesttype'] = 'kvm'
+ params['virt_type'] = 'kvm'
params['guestname'] = 'rhel5u4'
params['memory'] = '1048576'
params['vcpu'] = '2'
diff --git a/utils/xmlgenerator.py b/utils/xmlgenerator.py
index ee019b7..c2bdec5 100644
--- a/utils/xmlgenerator.py
+++ b/utils/xmlgenerator.py
@@ -30,12 +30,12 @@ def domain_xml(params, install = False):
domain = xml.dom.minidom.Document()
domain_element = domain.createElement('domain')
domain.appendChild(domain_element)
- if params['guesttype'] == 'xenpv' or params['guesttype'] ==
'xenfv':
+ if params['virt_type'] == 'xenpv' or params['virt_type'] ==
'xenfv':
domain_element.setAttribute('type', 'xen')
- elif params['guesttype'] == 'kvm' or params['guesttype'] ==
'qemu':
- domain_element.setAttribute('type', params['guesttype'])
+ elif params['virt_type'] == 'kvm' or params['virt_type'] ==
'qemu':
+ domain_element.setAttribute('type', params['virt_type'])
else:
- print 'Wrong guest type was set.'
+ print 'Wrong virt type was set.'
sys.exit(1)
# <name>
@@ -71,7 +71,7 @@ def domain_xml(params, install = False):
if not install:
# <bootloader>
- if params['guesttype'] == 'xenpv':
+ if params['virt_type'] == 'xenpv':
bootloader_element = domain.createElement('bootloader')
bootloader_node = domain.createTextNode('/usr/bin/pygrub')
bootloader_element.appendChild(bootloader_node)
@@ -84,43 +84,43 @@ def domain_xml(params, install = False):
if not install:
# <type>
type_element = domain.createElement('type')
- if params['guesttype'] == 'xenpv':
+ if params['virt_type'] == 'xenpv':
type_element.setAttribute('machine', 'xenpv')
type_node = domain.createTextNode('linux')
- elif params['guesttype'] == 'xenfv':
+ elif params['virt_type'] == 'xenfv':
type_element.setAttribute('machine', 'xenfv')
type_node = domain.createTextNode('hvm')
- elif params['guesttype'] == 'kvm' or params['guesttype']
== 'qemu':
+ elif params['virt_type'] == 'kvm' or params['virt_type']
== 'qemu':
type_element.setAttribute('machine', 'pc')
type_node = domain.createTextNode('hvm')
else:
- print 'Wrong guest type was set.'
+ print 'Wrong virt type was set.'
sys.exit(1)
type_element.appendChild(type_node)
os_element.appendChild(type_element)
# <loader>
- if params['guesttype'] == 'xenfv':
+ if params['virt_type'] == 'xenfv':
loader_element = domain.createElement('loader')
loader_node = domain.createTextNode('/usr/lib/xen/boot/hvmloader')
loader_element.appendChild(loader_node)
os_element.appendChild(loader_element)
# <boot>
- if params['guesttype'] != 'xenpv':
+ if params['virt_type'] != 'xenpv':
boot_element = domain.createElement('boot')
boot_element.setAttribute('dev', 'hd')
os_element.appendChild(boot_element)
elif install:
- if params['guesttype'] == 'xenpv' \
- or (params['guesttype'] == 'kvm' and not
params.has_key('bootcd')) \
- or (params['guesttype'] == 'qemu' and not
params.has_key('bootcd')):
+ if params['virt_type'] == 'xenpv' \
+ or (params['virt_type'] == 'kvm' and not
params.has_key('bootcd')) \
+ or (params['virt_type'] == 'qemu' and not
params.has_key('bootcd')):
# <type>
type_element = domain.createElement('type')
- if params['guesttype'] == 'xenpv':
+ if params['virt_type'] == 'xenpv':
type_node = domain.createTextNode('linux')
- if params['guesttype'] == 'kvm' or
params['guesttype'] == 'qemu':
+ if params['virt_type'] == 'kvm' or
params['virt_type'] == 'qemu':
type_node = domain.createTextNode('hvm')
type_element.appendChild(type_node)
os_element.appendChild(type_element)
@@ -140,21 +140,21 @@ def domain_xml(params, install = False):
cmdline_node = domain.createTextNode('ks=' +
params['kickstart'])
cmdline_element.appendChild(cmdline_node)
os_element.appendChild(cmdline_element)
- if params['guesttype'] != 'xenpv':
+ if params['virt_type'] != 'xenpv':
# <boot>
boot_element = domain.createElement('boot')
boot_element.setAttribute('dev', 'hd')
os_element.appendChild(boot_element)
- elif params['guesttype'] == 'xenfv' \
- or (params['guesttype'] == 'kvm' and
params.has_key('bootcd')) \
- or (params['guesttype'] == 'qemu' and
params.has_key('bootcd')):
+ elif params['virt_type'] == 'xenfv' \
+ or (params['virt_type'] == 'kvm' and
params.has_key('bootcd')) \
+ or (params['virt_type'] == 'qemu' and
params.has_key('bootcd')):
# <type>
type_element = domain.createElement('type')
type_node = domain.createTextNode('hvm')
type_element.appendChild(type_node)
os_element.appendChild(type_element)
- if params['guesttype'] == 'xenfv':
+ if params['virt_type'] == 'xenfv':
# <loader>
loader_element = domain.createElement('loader')
loader_node = domain.createTextNode(
@@ -170,7 +170,7 @@ def domain_xml(params, install = False):
# </os> -- END
# <features>
- if params['guesttype'] != 'xenpv':
+ if params['virt_type'] != 'xenpv':
features_element = domain.createElement('features')
domain_element.appendChild(features_element)
acpi_element = domain.createElement('acpi')
@@ -205,7 +205,7 @@ def domain_xml(params, install = False):
# <devices> -- START
devices_element = domain.createElement('devices')
-# if params['guesttype'] == 'xenfv':
+# if params['virt_type'] == 'xenfv':
# emulator_element = domain.createElement('emulator')
# host_arch = utils.get_host_arch()
# if host_arch == 'i386' or host_arch == 'ia64':
@@ -217,7 +217,7 @@ def domain_xml(params, install = False):
# sys.exit(1)
# emulator_element.appendChild(emulator_node)
# devices_element.appendChild(emulator_element)
-# if params['guesttype'] == 'kvm' or params['guesttype'] ==
'qemu':
+# if params['virt_type'] == 'kvm' or params['virt_type'] ==
'qemu':
# emulator_element = domain.createElement('emulator')
# emulator_node = domain.createTextNode('/usr/libexec/qemu-kvm')
# emulator_element.appendChild(emulator_node)
@@ -230,7 +230,7 @@ def domain_xml(params, install = False):
# <input>
input_element = domain.createElement('input')
input_element.setAttribute('type', 'mouse')
- if params['guesttype'] == 'xenpv':
+ if params['virt_type'] == 'xenpv':
input_element.setAttribute('bus', 'xen')
else:
if params.has_key('inputbus'):
@@ -275,7 +275,7 @@ def disk_xml(params, cdrom = False):
# <driver>
if not cdrom:
- if params['guesttype'] == 'kvm' or params['guesttype'] ==
'qemu':
+ if params['virt_type'] == 'kvm' or params['virt_type'] ==
'qemu':
driver_element = disk.createElement('driver')
driver_element.setAttribute('name', 'qemu')
if params.get('imagetype', None) == None:
@@ -285,19 +285,19 @@ def disk_xml(params, cdrom = False):
params['cache'] = 'none'
driver_element.setAttribute('cache', params['cache'])
disk_element.appendChild(driver_element)
- elif params['guesttype'] == 'xenpv' or
params['guesttype'] == 'xenfv':
+ elif params['virt_type'] == 'xenpv' or
params['virt_type'] == 'xenfv':
driver_element = disk.createElement('driver')
- if params['guesttype'] == 'xenpv':
+ if params['virt_type'] == 'xenpv':
driver_element.setAttribute('name', 'tap')
driver_element.setAttribute('type', 'aio')
- if params['guesttype'] == 'xenfv':
+ if params['virt_type'] == 'xenfv':
driver_element.setAttribute('name', 'file')
disk_element.appendChild(driver_element)
else:
- print 'Unknown guest type.'
+ print 'Unknown virt type.'
sys.exit(1)
elif cdrom:
- if params['guesttype'] == 'xenpv' or params['guesttype']
== 'xenfv':
+ if params['virt_type'] == 'xenpv' or params['virt_type']
== 'xenfv':
driver_element = disk.createElement('driver')
driver_element.setAttribute('name', 'file')
disk_element.appendChild(driver_element)
@@ -350,7 +350,7 @@ def disk_xml(params, cdrom = False):
print 'Wrong disk target device is specified.'
if not cdrom:
- if params['guesttype'] == 'xenpv':
+ if params['virt_type'] == 'xenpv':
target_element.setAttribute('dev', 'xvda')
target_element.setAttribute('bus', 'xen')
else:
--
1.7.7.3
5:07 a.m.
New subject: [libvirt] [test-API 10/14] Substitute 'guesttype' with 'virt_type'
On 04/19/2012 10:25 AM, Osier Yang wrote:
Also 'guest type' to 'virt type'. The principle is to
use the same
TERM as libvirt, and the projects around libvirt, e.g. python-virtinst.
---
cases/consumption_cpu_topology.conf | 2 +-
cases/consumption_domain_nfs_start.conf | 2 +-
cases/consumption_eventhandler.conf | 2 +-
cases/consumption_libvirtd.conf | 2 +-
cases/consumption_ownership_test.conf | 2 +-
cases/domain_linux_net_inst.conf | 4 +-
cases/linux_domain.conf | 10 ++--
cases/migration/ssh_persistent_paused_no_dst.conf | 24 ++++----
.../migration/ssh_persistent_paused_with_dst.conf | 48 +++++++-------
cases/migration/ssh_persistent_running_no_dst.conf | 24 ++++----
.../migration/ssh_persistent_running_with_dst.conf | 48 +++++++-------
cases/migration/ssh_transient_paused_no_dst.conf | 22 ++++----
cases/migration/ssh_transient_paused_with_dst.conf | 48 +++++++-------
cases/migration/ssh_transient_running_no_dst.conf | 24 ++++----
.../migration/ssh_transient_running_with_dst.conf | 48 +++++++-------
cases/migration/tcp_persistent_paused_no_dst.conf | 24 ++++----
.../migration/tcp_persistent_paused_with_dst.conf | 48 +++++++-------
cases/migration/tcp_persistent_running_no_dst.conf | 24 ++++----
.../migration/tcp_persistent_running_with_dst.conf | 48 +++++++-------
.../tcp_sasl_persistent_paused_no_dst.conf | 8 +-
.../tcp_sasl_persistent_paused_with_dst.conf | 16 +++---
.../tcp_sasl_persistent_running_no_dst.conf | 8 +-
.../tcp_sasl_persistent_running_with_dst.conf | 16 +++---
.../tcp_sasl_transient_paused_no_dst.conf | 8 +-
.../tcp_sasl_transient_paused_with_dst.conf | 16 +++---
.../tcp_sasl_transient_running_no_dst.conf | 8 +-
.../tcp_sasl_transient_running_with_dst.conf | 16 +++---
cases/migration/tcp_transient_paused_no_dst.conf | 22 ++++----
cases/migration/tcp_transient_paused_with_dst.conf | 48 +++++++-------
cases/migration/tcp_transient_running_no_dst.conf | 24 ++++----
.../migration/tcp_transient_running_with_dst.conf | 48 +++++++-------
cases/migration/tls_persistent_paused_no_dst.conf | 24 ++++----
.../migration/tls_persistent_paused_with_dst.conf | 48 +++++++-------
cases/migration/tls_persistent_running_no_dst.conf | 24 ++++----
.../migration/tls_persistent_running_with_dst.conf | 48 +++++++-------
.../tls_sasl_persistent_paused_no_dst.conf | 8 +-
.../tls_sasl_persistent_paused_with_dst.conf | 16 +++---
.../tls_sasl_persistent_running_no_dst.conf | 8 +-
.../tls_sasl_persistent_running_with_dst.conf | 16 +++---
.../tls_sasl_transient_paused_no_dst.conf | 8 +-
.../tls_sasl_transient_paused_with_dst.conf | 16 +++---
.../tls_sasl_transient_running_no_dst.conf | 8 +-
.../tls_sasl_transient_running_with_dst.conf | 16 +++---
cases/migration/tls_transient_paused_no_dst.conf | 22 ++++----
cases/migration/tls_transient_paused_with_dst.conf | 48 +++++++-------
cases/migration/tls_transient_running_no_dst.conf | 24 ++++----
.../migration/tls_transient_running_with_dst.conf | 48 +++++++-------
cases/snapshot.conf | 2 +-
cases/windows_domain.conf | 8 +-
.../en-US/Writing_a_test_case.xml | 2 +-
repos/domain/attach_disk.py | 2 +-
repos/domain/create.py | 2 +-
repos/domain/define.py | 14 ++--
repos/domain/detach_disk.py | 2 +-
repos/domain/install_image.py | 6 +-
repos/domain/install_linux_cdrom.py | 18 +++---
repos/domain/install_linux_check.py | 8 +-
repos/domain/install_linux_net.py | 20 +++---
repos/domain/install_windows_cdrom.py | 8 +-
repos/domain/update_devflag.py | 2 +-
.../multiple_thread_block_on_domain_create.py | 6 +-
utils/xmlbuilder.py | 14 ++--
utils/xmlgenerator.py | 64 ++++++++++----------
63 files changed, 626 insertions(+), 626 deletions(-)
ACK
Guannan Ren
9:25 p.m.
New subject: [libvirt] [test-API 11/14] Update AUTHORS
Sorted by the contribution date, not exactly.
---
AUTHORS | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 55cd38d..4ec4ca8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,14 +1,15 @@
+Maintainers and people with commit rights::
-The primary contributors:
-
- Daniel Veillard <veillard(a)redhat.com>
Guannan Ren <gren(a)redhat.com>
- Alex Jia <ajia(a)redhat.com>
+ Daniel Veillard <veillard(a)redhat.com>
Osier Yang <jyang(a)redhat.com>
- Nan Zhang <nzhang(a)redhat.com>
- Gurhan Ozen <gozen(a)redhat.com>
- Johnny Liu <jialiu(a)redhat.com>
- Guannan Sun <gsun(a)redhat.com>
Peter Krempa <pkrempa(a)redhat.com>
Martin Kletzander <mkletzan(a)redhat.com>
+
+Patches have also been contributed by:
+ Alex Jia <ajia(a)redhat.com>
+ Nan Zhang <nzhang(a)redhat.com>
+ Johnny Liu <jialiu(a)redhat.com>
+ Gurhan Ozen <gozen(a)redhat.com>
XiaoQiang Hu <xhu(a)redhat.com>
+ Guannan Sun <gsun(a)redhat.com>
--
1.7.7.3
9:25 p.m.
New subject: [libvirt] [test-API 12/14] Rename utils/*.py with consistent naming style
We use foo_bar across the project (except the main program), though
it might be not good to use "foo_bar" as the module name in Python,
but let's unify it first.
---
.../en-US/Understanding_libvirt-test-API.xml | 4 +-
.../en-US/Writing_a_test_case.xml | 8 ++--
libvirt-test-api | 8 ++--
repos/domain/attach_disk.py | 4 +-
repos/domain/attach_interface.py | 4 +-
repos/domain/create.py | 4 +-
repos/domain/define.py | 4 +-
repos/domain/detach_disk.py | 4 +-
repos/domain/detach_interface.py | 4 +-
repos/domain/install_image.py | 4 +-
repos/domain/install_linux_cdrom.py | 6 +-
repos/domain/install_linux_net.py | 6 +-
repos/domain/install_windows_cdrom.py | 6 +-
repos/domain/migrate.py | 2 +-
repos/domain/update_devflag.py | 6 +-
repos/interface/create.py | 2 +-
repos/interface/define.py | 4 +-
repos/interface/destroy.py | 2 +-
repos/interface/undefine.py | 2 +-
repos/network/create.py | 4 +-
repos/network/define.py | 4 +-
repos/npiv/create_virtual_hba.py | 4 +-
.../multiple_thread_block_on_domain_create.py | 4 +-
repos/snapshot/internal_create.py | 4 +-
repos/storage/activate_pool.py | 2 +-
repos/storage/create_dir_pool.py | 4 +-
repos/storage/create_dir_volume.py | 4 +-
repos/storage/create_fs_pool.py | 8 ++--
repos/storage/create_iscsi_pool.py | 4 +-
repos/storage/create_logical_volume.py | 4 +-
repos/storage/create_netfs_pool.py | 8 ++--
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_partition_volume.py | 2 +-
repos/storage/destroy_pool.py | 2 +-
src/logxmlparser.py | 2 +-
utils/{xmlbuilder.py => xml_builder.py} | 44 ++++++++++----------
utils/{xmlgenerator.py => xml_generator.py} | 2 +-
utils/{XMLParser.py => xml_parser.py} | 8 ++--
46 files changed, 117 insertions(+), 117 deletions(-)
rename utils/{xmlbuilder.py => xml_builder.py} (91%)
rename utils/{xmlgenerator.py => xml_generator.py} (99%)
rename utils/{XMLParser.py => xml_parser.py} (96%)
diff --git
a/docs/User_Guide/libvirt-test-API_Guide/en-US/Understanding_libvirt-test-API.xml
b/docs/User_Guide/libvirt-test-API_Guide/en-US/Understanding_libvirt-test-API.xml
index 7fe1e97..88c1b76 100644
--- a/docs/User_Guide/libvirt-test-API_Guide/en-US/Understanding_libvirt-test-API.xml
+++ b/docs/User_Guide/libvirt-test-API_Guide/en-US/Understanding_libvirt-test-API.xml
@@ -197,10 +197,10 @@ repos
<para><filename>/utils</filename> is a directory which contains
various scripts to assist in creating and verifying test cases.</para>
<!--<itemizedlist>
<listitem>
- <para><filename>xmlgenerator.py</filename>XML
generator.</para>
+ <para><filename>xml_generator.py</filename>XML
generator.</para>
</listitem>
<listitem>
- <para><filename>xmlbuilder.py</filename> builds a virtual
machine from an XML file.</para>
+ <para><filename>xml_builder.py</filename> builds a virtual
machine from an XML file.</para>
</listitem>
<listitem>
<para>Random MAC address generator. Useful when installing a guest
machine.</para>
diff --git a/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml
b/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml
index 21c4ac6..2a74518 100644
--- a/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml
+++ b/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml
@@ -142,7 +142,7 @@ import exception
from lib import connectAPI
from lib import storageAPI
from utils import env_parser
-from utils import xmlbuilder
+from utils import xml_builder
envfile = 'env.ini'
@@ -154,7 +154,7 @@ def initialize_storage(dict):
dict['sourcepath'] = envparser.get_value('storage',
'sourcepath')
logger.info('prepare create storage pool')
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(dict)
logger.debug('dump create storage pool xml:\n%s' %poolxml)
@@ -201,7 +201,7 @@ import exception
from lib import connectAPI
from lib import domainAPI
from utils import env_parser
-from utils import xmlbuilder
+from utils import xml_builder
envfile = 'env.ini'
@@ -246,7 +246,7 @@ def install_guest(dict):
logger.info('prepare installation booting cdrom')
prepare_cdrom(url, dict['kickstart'], gname, logger)
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
guestinstxml = xmlobj.build_domain_install(dict)
logger.debug('dump installation guest xml:\n%s' %guestinstxml)
diff --git a/libvirt-test-api b/libvirt-test-api
index 7eaaf21..62e18f6 100755
--- a/libvirt-test-api
+++ b/libvirt-test-api
@@ -28,7 +28,7 @@ from src import generator
from src import env_clear
from src import process
from utils import log
-from src.logxmlparser import LogXMLParser
+from src.logxmlparser import Logxml_parser
from src.activityfilter import Filter
from src.casecfgcheck import CaseCfgCheck
@@ -93,7 +93,7 @@ class Main(object):
testrunid = time.strftime("%Y%m%d%H%M%S")
os.makedirs('log/%s' %testrunid)
- log_xml_parser = LogXMLParser(self.logxml)
+ log_xml_parser = Logxml_parser(self.logxml)
# If the specified log xmlfile exists, then append the testrun
# item of this time to the file, if not, create a new log xmlfile
@@ -256,7 +256,7 @@ class Main(object):
def remove_log(self, testrunid, testid = None):
""" to remove log item in the log xmlfile """
- log_xml_parser = LogXMLParser(self.logxml)
+ log_xml_parser = Logxml_parser(self.logxml)
# remove a test in a testrun
if testrunid and testid:
@@ -289,7 +289,7 @@ class Main(object):
def merge_logxmls(self, logxml_two):
""" to merge two log xml files of log into one"""
- log_xml_parser = LogXMLParser(self.logxml)
+ log_xml_parser = Logxml_parser(self.logxml)
log_xml_parser.merge_xmlfiles(logxml_two)
print "Merge the second log xml file %s to %s successfully " % \
(logxml_two, self.logxml)
diff --git a/repos/domain/attach_disk.py b/repos/domain/attach_disk.py
index fc0e611..4711ad1 100644
--- a/repos/domain/attach_disk.py
+++ b/repos/domain/attach_disk.py
@@ -12,7 +12,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname',
'virt_type',
@@ -68,7 +68,7 @@ def attach_disk(params):
domobj = conn.lookupByName(guestname)
# Generate disk xml
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
diskxml = xmlobj.build_disk(params)
logger.debug("disk xml:\n%s" %diskxml)
diff --git a/repos/domain/attach_interface.py b/repos/domain/attach_interface.py
index 5c9c507..4d605f9 100644
--- a/repos/domain/attach_interface.py
+++ b/repos/domain/attach_interface.py
@@ -10,7 +10,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname', 'ifacetype', 'source',)
optional_params = ('hdmodel',)
@@ -40,7 +40,7 @@ def attach_interface(params):
domobj = conn.lookupByName(guestname)
# Generate interface xml
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
interfacexml = xmlobj.build_interface(params)
logger.debug("interface xml:\n%s" %interfacexml)
diff --git a/repos/domain/create.py b/repos/domain/create.py
index 9f2f5e1..ed96b36 100644
--- a/repos/domain/create.py
+++ b/repos/domain/create.py
@@ -11,7 +11,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
NONE = 0
START_PAUSED = 1
@@ -43,7 +43,7 @@ def create(params):
conn = sharedmod.libvirtobj['conn']
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
domain = xmlobj.add_domain(params)
xmlobj.add_disk(params, domain)
xmlobj.add_interface(params, domain)
diff --git a/repos/domain/define.py b/repos/domain/define.py
index dae1062..92a98f6 100644
--- a/repos/domain/define.py
+++ b/repos/domain/define.py
@@ -12,7 +12,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname', 'virt_type',)
optional_params = ('uuid',
@@ -70,7 +70,7 @@ def define(params):
logger.info("define domain on %s" % uri)
# Generate damain xml
- xml_obj = xmlbuilder.XmlBuilder()
+ xml_obj = xml_builder.XmlBuilder()
domain = xml_obj.add_domain(params)
xml_obj.add_disk(params, domain)
xml_obj.add_interface(params, domain)
diff --git a/repos/domain/detach_disk.py b/repos/domain/detach_disk.py
index da25c8f..d723474 100644
--- a/repos/domain/detach_disk.py
+++ b/repos/domain/detach_disk.py
@@ -11,7 +11,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname', 'virt_type', 'imagename',
'hdmodel',)
optional_params = ()
@@ -45,7 +45,7 @@ def detach_disk(params):
domobj = conn.lookupByName(guestname)
# Detach disk
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
diskxml = xmlobj.build_disk(params)
logger.debug("disk xml:\n%s" %diskxml)
diff --git a/repos/domain/detach_interface.py b/repos/domain/detach_interface.py
index c444b68..82deffb 100644
--- a/repos/domain/detach_interface.py
+++ b/repos/domain/detach_interface.py
@@ -11,7 +11,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname', 'ifacetype', 'source',
'nicmodel',)
optional_params = ()
@@ -47,7 +47,7 @@ def detach_interface(params):
conn = sharedmod.libvirtobj['conn']
domobj = conn.lookupByName(guestname)
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
ifacexml = xmlobj.build_interface(params)
logger.debug("interface xml:\n%s" % ifacexml)
diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py
index 2ab97a0..be36b03 100644
--- a/repos/domain/install_image.py
+++ b/repos/domain/install_image.py
@@ -13,7 +13,7 @@ from libvirt import libvirtError
from src import sharedmod
from src import env_parser
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
HOME_PATH = os.getcwd()
@@ -72,7 +72,7 @@ def install_image(params):
conn = sharedmod.libvirtobj['conn']
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
domain = xmlobj.add_domain(params)
xmlobj.add_disk(params, domain)
diff --git a/repos/domain/install_linux_cdrom.py b/repos/domain/install_linux_cdrom.py
index 235f587..ee3c397 100644
--- a/repos/domain/install_linux_cdrom.py
+++ b/repos/domain/install_linux_cdrom.py
@@ -16,7 +16,7 @@ from libvirt import libvirtError
from src import sharedmod
from src import env_parser
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname', 'virt_type', 'guestos',
'guestarch',)
optional_params = ('uuid',
@@ -93,7 +93,7 @@ def prepare_boot_guest(domobj, dict, logger, installtype):
guestname = params['guestname']
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
domain = xmlobj.add_domain(params)
xmlobj.add_disk(params, domain)
@@ -258,7 +258,7 @@ def install_linux_cdrom(params):
logger.error("unknown virt type: %s" % virt_type)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
guestxml = xmlobj.build_domain_install(params)
logger.debug('dump installation guest xml:\n%s' % guestxml)
diff --git a/repos/domain/install_linux_net.py b/repos/domain/install_linux_net.py
index 9841eed..105c0ea 100644
--- a/repos/domain/install_linux_net.py
+++ b/repos/domain/install_linux_net.py
@@ -16,7 +16,7 @@ from libvirt import libvirtError
from src import sharedmod
from src import env_parser
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname', 'virt_type', 'guestos',
'guestarch','netmethod',)
optional_params = ('uuid',
@@ -50,7 +50,7 @@ def prepare_boot_guest(domobj, dict, logger, installtype):
guestname = params['guestname']
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
domain = xmlobj.add_domain(params)
xmlobj.add_disk(params, domain)
@@ -240,7 +240,7 @@ def install_linux_net(params):
logger.error("unknown virt type %s" % virt_type)
# Prepare guest installation xml
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
guestxml = xmlobj.build_domain_install(params)
logger.debug('dump installation guest xml:\n%s' % guestxml)
diff --git a/repos/domain/install_windows_cdrom.py
b/repos/domain/install_windows_cdrom.py
index 6cec08a..825aa29 100644
--- a/repos/domain/install_windows_cdrom.py
+++ b/repos/domain/install_windows_cdrom.py
@@ -15,7 +15,7 @@ from libvirt import libvirtError
from src import sharedmod
from src import env_parser
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
VIRSH_QUIET_LIST = "virsh --quiet list --all|awk '{print $2}'|grep
\"^%s$\""
VM_STAT = "virsh --quiet list --all| grep \"\\b%s\\b\"|grep off"
@@ -152,7 +152,7 @@ def prepare_boot_guest(domobj, dict, installtype):
guestname = params['guestname']
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
domain = xmlobj.add_domain(params)
xmlobj.add_disk(params, domain)
@@ -285,7 +285,7 @@ def install_windows_cdrom(params):
return 1
params['floppysource'] = FLOOPY_IMG
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
guestxml = xmlobj.build_domain_install_win(params)
logger.debug('dump installation guest xml:\n%s' % guestxml)
diff --git a/repos/domain/migrate.py b/repos/domain/migrate.py
index 2e6b40d..7a38a29 100644
--- a/repos/domain/migrate.py
+++ b/repos/domain/migrate.py
@@ -11,7 +11,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('transport',
'target_machine',
diff --git a/repos/domain/update_devflag.py b/repos/domain/update_devflag.py
index 9286918..6c75fd6 100644
--- a/repos/domain/update_devflag.py
+++ b/repos/domain/update_devflag.py
@@ -12,7 +12,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname', 'devtype', 'username',
'password',)
optional_params = ()
@@ -192,7 +192,7 @@ def update_devflag(params):
guestobj = minidom.parseString(guestxml)
# Generat device XML for original use
- origxmlobj = xmlbuilder.XmlBuilder()
+ origxmlobj = xml_builder.XmlBuilder()
if devtype == 'cdrom':
origxmlobj.add_cdrom(xmlargs, guestobj)
@@ -217,7 +217,7 @@ def update_devflag(params):
return 1
# Generate device XML for updating
- newxmlobj = xmlbuilder.XmlBuilder()
+ newxmlobj = xml_builder.XmlBuilder()
if devtype == 'cdrom':
xmlargs['bootcd'] = '/var/lib/libvirt/boot/cdrom-new.img'
diff --git a/repos/interface/create.py b/repos/interface/create.py
index 9df3464..3afcafb 100644
--- a/repos/interface/create.py
+++ b/repos/interface/create.py
@@ -10,7 +10,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('ifacename',)
optional_params = ()
diff --git a/repos/interface/define.py b/repos/interface/define.py
index 630ae45..4d39e6a 100644
--- a/repos/interface/define.py
+++ b/repos/interface/define.py
@@ -8,7 +8,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('ifacename', 'ifacetype',)
optional_params = ()
@@ -37,7 +37,7 @@ def define(params):
logger.error("interface %s have been defined" % ifacename)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
iface_xml = xmlobj.build_host_interface(params)
logger.debug("interface xml:\n%s" %iface_xml)
diff --git a/repos/interface/destroy.py b/repos/interface/destroy.py
index 7dc0320..4dcfc73 100644
--- a/repos/interface/destroy.py
+++ b/repos/interface/destroy.py
@@ -10,7 +10,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('ifacename',)
optional_params = ()
diff --git a/repos/interface/undefine.py b/repos/interface/undefine.py
index 757d3f9..85d4489 100644
--- a/repos/interface/undefine.py
+++ b/repos/interface/undefine.py
@@ -8,7 +8,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('ifacename',)
optional_params = ()
diff --git a/repos/network/create.py b/repos/network/create.py
index d50c84d..8fc87a2 100644
--- a/repos/network/create.py
+++ b/repos/network/create.py
@@ -10,7 +10,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('networkname',
'bridgename',
@@ -46,7 +46,7 @@ def create(params):
logger.error("the %s network is running" % networkname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
netxml = xmlobj.build_network(params)
logger.debug("%s network xml:\n%s" % (networkname, netxml))
diff --git a/repos/network/define.py b/repos/network/define.py
index 8c02d2a..beafe1d 100644
--- a/repos/network/define.py
+++ b/repos/network/define.py
@@ -10,7 +10,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('networkname',
'bridgename',
@@ -49,7 +49,7 @@ def define(params):
logger.error("%s network is defined" % networkname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
netxml = xmlobj.build_network(params)
logger.debug("network xml:\n%s" % netxml)
diff --git a/repos/npiv/create_virtual_hba.py b/repos/npiv/create_virtual_hba.py
index a558fbc..a5005ca 100644
--- a/repos/npiv/create_virtual_hba.py
+++ b/repos/npiv/create_virtual_hba.py
@@ -6,7 +6,7 @@ import sys
import re
import commands
import xml.dom.minidom
-from utils import xmlbuilder
+from utils import xml_builder
import libvirt
from libvirt import libvirtError
@@ -70,7 +70,7 @@ def create_virtual_hba(params):
else:
logger.info("No NPIV capabilities on '%s'" % fc_name)
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
nodedev_xml = xmlobj.build_nodedev(params)
logger.debug("node device xml:\n%s" % nodedev_xml)
diff --git a/repos/regression/multiple_thread_block_on_domain_create.py
b/repos/regression/multiple_thread_block_on_domain_create.py
index a72fdaf..1c85706 100644
--- a/repos/regression/multiple_thread_block_on_domain_create.py
+++ b/repos/regression/multiple_thread_block_on_domain_create.py
@@ -16,7 +16,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
from utils import env_parser
-from utils import xmlbuilder
+from utils import xml_builder
IMAG_PATH = "/var/lib/libvirt/images/"
DISK_DD = "dd if=/dev/zero of=%s bs=1 count=1 seek=6G"
@@ -76,7 +76,7 @@ class guest_install(Thread):
else:
self.logger.info("creating disk images file is successful.")
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
guestxml = xmlobj.build_domain_install(guest_params)
self.logger.debug("guestxml is %s" % guestxml)
self.logger.info('create guest %sfrom xml description' % self.name)
diff --git a/repos/snapshot/internal_create.py b/repos/snapshot/internal_create.py
index d0f3906..6ddf350 100644
--- a/repos/snapshot/internal_create.py
+++ b/repos/snapshot/internal_create.py
@@ -11,7 +11,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname',)
optional_params = ('snapshotname',)
@@ -63,7 +63,7 @@ def internal_create(params):
logger.error("checking failed")
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
snapshot_xml = xmlobj.build_domain_snapshot(params)
logger.debug("%s snapshot xml:\n%s" % (guestname, snapshot_xml))
diff --git a/repos/storage/activate_pool.py b/repos/storage/activate_pool.py
index 3954457..51aa7fc 100644
--- a/repos/storage/activate_pool.py
+++ b/repos/storage/activate_pool.py
@@ -9,7 +9,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname',)
optional_params = ()
diff --git a/repos/storage/create_dir_pool.py b/repos/storage/create_dir_pool.py
index 067ae92..5747585 100644
--- a/repos/storage/create_dir_pool.py
+++ b/repos/storage/create_dir_pool.py
@@ -9,7 +9,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'pooltype',)
optional_params = ()
@@ -45,7 +45,7 @@ def create_dir_pool(params):
logger.error("%s storage pool has already been created" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/create_dir_volume.py b/repos/storage/create_dir_volume.py
index 155eb3b..41fb270 100644
--- a/repos/storage/create_dir_volume.py
+++ b/repos/storage/create_dir_volume.py
@@ -11,7 +11,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'volname', 'volformat',
'capacity',)
optional_params = ()
@@ -112,7 +112,7 @@ def create_dir_volume(params):
the volume information in the pool %s" % poolname)
virsh_vol_list(poolname)
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
volumexml = xmlobj.build_volume(params)
logger.debug("volume xml:\n%s" % volumexml)
diff --git a/repos/storage/create_fs_pool.py b/repos/storage/create_fs_pool.py
index 7daf5f6..9bff2c7 100644
--- a/repos/storage/create_fs_pool.py
+++ b/repos/storage/create_fs_pool.py
@@ -9,8 +9,8 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
-from utils import XMLParser
+from utils import xml_builder
+from utils import xml_parser
required_params = ('poolname', 'sourcepath', 'pooltype',)
optional_params = ('sourceformat',)
@@ -30,7 +30,7 @@ def check_pool_create_libvirt(conn, poolname, logger):
def check_pool_create_OS(poolobj, logger):
"""Check the result of create storage pool on OS level.
"""
poolxml = poolobj.XMLDesc(0)
- out = XMLParser.XMLParser().parse(poolxml)
+ out = xml_parser.xml_parser().parse(poolxml)
src_path =
out["source"]["device"]["attr"]["path"]
dest_path = out["target"]["path"]
logger.info("src path: %s tgt path: %s" % (src_path, dest_path))
@@ -64,7 +64,7 @@ def create_fs_pool(params):
logger.error("%s storage pool has already been created" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/create_iscsi_pool.py b/repos/storage/create_iscsi_pool.py
index f108a59..85428cd 100644
--- a/repos/storage/create_iscsi_pool.py
+++ b/repos/storage/create_iscsi_pool.py
@@ -8,7 +8,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'sourcename', 'sourcepath',
'pooltype',)
optional_params = ()
@@ -44,7 +44,7 @@ def create_iscsi_pool(params):
logger.error("%s storage pool has already been created" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/create_logical_volume.py
b/repos/storage/create_logical_volume.py
index 714480c..294ac73 100644
--- a/repos/storage/create_logical_volume.py
+++ b/repos/storage/create_logical_volume.py
@@ -12,7 +12,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'pooltype', 'volname',
'capacity',)
optional_params = ()
@@ -101,7 +101,7 @@ def create_logical_volume(params):
params['volpath'] = "%s/%s" % (poolpath, volname)
logger.debug("volume target path: %s" % params['volpath'])
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
volxml = xmlobj.build_volume(params)
logger.debug("storage volume xml:\n%s" % volxml)
diff --git a/repos/storage/create_netfs_pool.py b/repos/storage/create_netfs_pool.py
index 2a0cd23..e16ea63 100644
--- a/repos/storage/create_netfs_pool.py
+++ b/repos/storage/create_netfs_pool.py
@@ -9,8 +9,8 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
-from utils import XMLParser
+from utils import xml_builder
+from utils import xml_parser
required_params = ('poolname', 'sourcename', 'sourcepath',
'pooltype',)
optional_params = ('targetpath',)
@@ -36,7 +36,7 @@ def check_pool_create_OS(conn, poolname, logger):
poolobj = conn.storagePoolLookupByName(poolname)
poolxml = poolobj.XMLDesc(0)
# parse the xml to see where this is mounted...
- out = XMLParser.XMLParser().parse(poolxml)
+ out = xml_parser.xml_parser().parse(poolxml)
dest_path = out["target"]["path"]
src_host =
out["source"]["host"]["attr"]["name"]
src_path =
out["source"]["dir"]["attr"]["path"]
@@ -71,7 +71,7 @@ def create_netfs_pool(params):
logger.error("%s storage pool has already been created" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/create_netfs_volume.py b/repos/storage/create_netfs_volume.py
index e5f711a..da96f53 100644
--- a/repos/storage/create_netfs_volume.py
+++ b/repos/storage/create_netfs_volume.py
@@ -11,7 +11,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'volname', 'volformat',
'capacity',)
optional_params = ()
@@ -112,7 +112,7 @@ def create_netfs_volume(params):
ouput the volume information in the pool %s" % poolname)
virsh_vol_list(poolname)
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
volumexml = xmlobj.build_volume(params)
logger.debug("volume xml:\n%s" % volumexml)
diff --git a/repos/storage/create_partition_volume.py
b/repos/storage/create_partition_volume.py
index 3ba802b..317697e 100644
--- a/repos/storage/create_partition_volume.py
+++ b/repos/storage/create_partition_volume.py
@@ -10,7 +10,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'volname', 'volformat',
'capacity',)
optional_params = ()
@@ -82,7 +82,7 @@ def create_partition_volume(params):
ouput the volume information in the pool %s" % poolname)
virsh_vol_list(poolname)
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
volumexml = xmlobj.build_volume(params)
logger.debug("volume xml:\n%s" % volumexml)
diff --git a/repos/storage/define_dir_pool.py b/repos/storage/define_dir_pool.py
index b45767d..0c8dbb7 100644
--- a/repos/storage/define_dir_pool.py
+++ b/repos/storage/define_dir_pool.py
@@ -10,7 +10,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
VIRSH_POOLLIST = "virsh --quiet pool-list --all|awk '{print $1}'|grep
\"^%s$\""
POOL_STAT = "virsh --quiet pool-list --all|grep \"^%s\\b\" |grep
\"inactive\""
@@ -53,7 +53,7 @@ def define_dir_pool(params):
logger.error("%s storage pool is defined" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/define_disk_pool.py b/repos/storage/define_disk_pool.py
index 619292f..56a2f09 100644
--- a/repos/storage/define_disk_pool.py
+++ b/repos/storage/define_disk_pool.py
@@ -9,7 +9,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'pooltype', 'sourcepath',)
optional_params = ('sourceformat', 'targetpath',)
@@ -54,7 +54,7 @@ def define_disk_pool(params):
logger.error("%s storage pool is defined" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/define_iscsi_pool.py b/repos/storage/define_iscsi_pool.py
index fdb09a2..1a1e247 100644
--- a/repos/storage/define_iscsi_pool.py
+++ b/repos/storage/define_iscsi_pool.py
@@ -9,7 +9,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'pooltype', 'sourcename',
'sourcepath',)
optional_params = ()
@@ -57,7 +57,7 @@ def define_iscsi_pool(params):
logger.error("%s storage pool is ALREADY defined" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/define_logical_pool.py b/repos/storage/define_logical_pool.py
index ebbdc76..869f2c5 100644
--- a/repos/storage/define_logical_pool.py
+++ b/repos/storage/define_logical_pool.py
@@ -9,7 +9,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'pooltype', 'sourcename',
'sourcepath',)
optional_params = ()
@@ -42,7 +42,7 @@ def define_logical_pool(params):
logger.error("%s storage pool is defined" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/define_mpath_pool.py b/repos/storage/define_mpath_pool.py
index 930f9b8..0780706 100644
--- a/repos/storage/define_mpath_pool.py
+++ b/repos/storage/define_mpath_pool.py
@@ -8,7 +8,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'pooltype',)
optional_params = ('targetpath',)
@@ -50,7 +50,7 @@ def define_mpath_pool(params):
logger.error("%s storage pool is defined" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/define_netfs_pool.py b/repos/storage/define_netfs_pool.py
index e607da2..d0fdf12 100644
--- a/repos/storage/define_netfs_pool.py
+++ b/repos/storage/define_netfs_pool.py
@@ -9,7 +9,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'pooltype', 'sourcename',
'sourcepath',)
optional_params = ('targetpath',)
@@ -42,7 +42,7 @@ def define_netfs_pool(params):
logger.error("%s storage pool is defined" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/define_scsi_pool.py b/repos/storage/define_scsi_pool.py
index 8be591a..c486a95 100644
--- a/repos/storage/define_scsi_pool.py
+++ b/repos/storage/define_scsi_pool.py
@@ -9,7 +9,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'pooltype', 'sourcename',)
optional_params = ('targetpath',)
@@ -54,7 +54,7 @@ def define_scsi_pool(params):
logger.error("%s storage pool is defined" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/delete_partition_volume.py
b/repos/storage/delete_partition_volume.py
index b70ff45..17a4cd9 100644
--- a/repos/storage/delete_partition_volume.py
+++ b/repos/storage/delete_partition_volume.py
@@ -9,7 +9,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'volname',)
optional_params = ()
diff --git a/repos/storage/destroy_pool.py b/repos/storage/destroy_pool.py
index 304f1bb..8566a84 100644
--- a/repos/storage/destroy_pool.py
+++ b/repos/storage/destroy_pool.py
@@ -8,7 +8,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname',)
optional_params = ()
diff --git a/src/logxmlparser.py b/src/logxmlparser.py
index 3b377ce..36d743e 100644
--- a/src/logxmlparser.py
+++ b/src/logxmlparser.py
@@ -24,7 +24,7 @@ from xml.dom.minidom import Document
from src import exception
-class LogXMLParser(object):
+class Logxml_parser(object):
""" Generate and parser log xml file
"""
def __init__(self, logxml):
diff --git a/utils/xmlbuilder.py b/utils/xml_builder.py
similarity index 91%
rename from utils/xmlbuilder.py
rename to utils/xml_builder.py
index 85cda03..435aa84 100644
--- a/utils/xmlbuilder.py
+++ b/utils/xml_builder.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# xmlbuilder.py: Class for building XML for libvirt objects.
+# xml_builder.py: Class for building XML for libvirt objects.
#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
@@ -21,7 +21,7 @@ __DEBUG__ = False
import os, sys
import xml.dom.minidom
-import xmlgenerator
+import xml_generator
class XmlBuilder:
"""Operation for building domain xml"""
@@ -29,43 +29,43 @@ class XmlBuilder:
print doc.toprettyxml()
def add_domain(self, params):
- domain = xmlgenerator.domain_xml(params)
+ domain = xml_generator.domain_xml(params)
return domain
def add_disk(self, params, domain):
- disk = xmlgenerator.disk_xml(params)
+ disk = xml_generator.disk_xml(params)
disk_node = domain.importNode(disk.childNodes[0], True)
domain.getElementsByTagName("devices")[0].insertBefore(
disk_node, domain.getElementsByTagName("console")[0])
def add_floppy(self, params, domain):
- floppy = xmlgenerator.floppy_xml(params)
+ floppy = xml_generator.floppy_xml(params)
floppy_node = domain.importNode(floppy.childNodes[0], True)
domain.getElementsByTagName("devices")[0].insertBefore(
floppy_node, domain.getElementsByTagName("console")[0])
def add_cdrom(self, params, domain):
- cdrom = xmlgenerator.disk_xml(params, True)
+ cdrom = xml_generator.disk_xml(params, True)
cdrom_node = domain.importNode(cdrom.childNodes[0], True)
domain.getElementsByTagName("devices")[0].insertBefore(
cdrom_node, domain.getElementsByTagName("console")[0])
def add_interface(self, params, domain):
- interface = xmlgenerator.interface_xml(params)
+ interface = xml_generator.interface_xml(params)
interface_node = domain.importNode(interface.childNodes[0], True)
domain.getElementsByTagName("devices")[0].insertBefore(
interface_node, domain.getElementsByTagName("console")[0])
return interface
def add_hostdev(self, params, domain):
- hostdev = xmlgenerator.hostdev_xml(params)
+ hostdev = xml_generator.hostdev_xml(params)
hostdev_node = domain.importNode(hostdev.childNodes[0], True)
domain.getElementsByTagName("devices")[0].insertBefore(
hostdev_node, domain.getElementsByTagName("console")[0])
return hostdev
def build_domain_install(self, params):
- domain = xmlgenerator.domain_xml(params, True)
+ domain = xml_generator.domain_xml(params, True)
self.add_disk(params, domain)
if params['virt_type'] != 'xenpv':
if params.has_key('bootcd'):
@@ -76,7 +76,7 @@ class XmlBuilder:
return domain.toxml()
def build_domain_install_win(self, params):
- domain = xmlgenerator.domain_xml(params, True)
+ domain = xml_generator.domain_xml(params, True)
self.add_disk(params, domain)
self.add_floppy(params, domain)
if params.has_key('bootcd'):
@@ -102,7 +102,7 @@ class XmlBuilder:
else:
print 'Wrong harddisk model.'
- disk = xmlgenerator.disk_xml(params)
+ disk = xml_generator.disk_xml(params)
if params['virt_type'] == 'xenpv':
disk.getElementsByTagName("target")[0].setAttribute("dev",
"xvdb")
else:
@@ -123,7 +123,7 @@ class XmlBuilder:
else:
print 'Wrong cdrom model.'
- cdrom = xmlgenerator.disk_xml(params, True)
+ cdrom = xml_generator.disk_xml(params, True)
if params['virt_type'] == 'xenpv':
cdrom.getElementsByTagName("target")[0].setAttribute("dev",
"xvdc")
else:
@@ -134,61 +134,61 @@ class XmlBuilder:
return cdrom.toxml()
def build_floppy(self, params):
- floppy = xmlgenerator.floppy_xml(params)
+ floppy = xml_generator.floppy_xml(params)
if __DEBUG__:
self.write_toxml(floppy)
return floppy.toxml()
def build_interface(self, params):
- interface = xmlgenerator.interface_xml(params)
+ interface = xml_generator.interface_xml(params)
if __DEBUG__:
self.write_toxml(interface)
return interface.toxml()
def build_hostdev(self, params):
- hostdev = xmlgenerator.hostdev_xml(params)
+ hostdev = xml_generator.hostdev_xml(params)
if __DEBUG__:
self.write_toxml(hostdev)
return hostdev.toxml()
def build_pool(self, params):
- pool = xmlgenerator.pool_xml(params)
+ pool = xml_generator.pool_xml(params)
if __DEBUG__:
self.write_toxml(pool)
return pool.toxml()
def build_volume(self, params):
- volume = xmlgenerator.volume_xml(params)
+ volume = xml_generator.volume_xml(params)
if __DEBUG__:
self.write_toxml(volume)
return volume.toxml()
def build_network(self, params):
- network = xmlgenerator.network_xml(params)
+ network = xml_generator.network_xml(params)
if __DEBUG__:
self.write_toxml(network)
return network.toxml()
def build_host_interface(self, params):
- interface = xmlgenerator.host_iface_xml(params)
+ interface = xml_generator.host_iface_xml(params)
if __DEBUG__:
self.write_toxml(interface)
return interface.toxml()
def build_domain_snapshot(self, params):
- snapshot = xmlgenerator.snapshot_xml(params)
+ snapshot = xml_generator.snapshot_xml(params)
if __DEBUG__:
self.write_toxml(snapshot)
return snapshot.toxml()
def build_secret(self, params):
- secret = xmlgenerator.secret_xml(params)
+ secret = xml_generator.secret_xml(params)
if __DEBUG__:
self.write_toxml(secret)
return secret.toxml()
def build_nodedev(self, params):
- nodedev = xmlgenerator.nodedev_xml(params)
+ nodedev = xml_generator.nodedev_xml(params)
if __DEBUG__:
self.write_toxml(nodedev)
return nodedev.toxml()
diff --git a/utils/xmlgenerator.py b/utils/xml_generator.py
similarity index 99%
rename from utils/xmlgenerator.py
rename to utils/xml_generator.py
index c2bdec5..e173543 100644
--- a/utils/xmlgenerator.py
+++ b/utils/xml_generator.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# xmlgenerator.py: Generate XML for libvirt objects.
+# xml_generator.py: Generate XML for libvirt objects.
#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
diff --git a/utils/XMLParser.py b/utils/xml_parser.py
similarity index 96%
rename from utils/XMLParser.py
rename to utils/xml_parser.py
index 20a376e..04e7501 100644
--- a/utils/XMLParser.py
+++ b/utils/xml_parser.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# XMLParser.py: Parse XML document, the result is a python dict.
+# xml_parser.py: Parse XML document, the result is a python dict.
#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
@@ -21,8 +21,8 @@ import os
from xml.dom import minidom
import StringIO
-class XMLParser(object):
- """Class XMLParser. It parses and xml document into a python
dictionary.
+class xml_parser(object):
+ """Class xml_parser. It parses and xml document into a python
dictionary.
The elements of the xml documents will be python dictionary keys. For
example, the xml document:
<firstel>firstdata</firstel>
@@ -32,7 +32,7 @@ class XMLParser(object):
will be parsed into the python dictionary:
{ "firstel":"firstdata" ,
"secondel":{"subsinsecond":"seconddata"} }
Then the data can be retrieve as:
- out = XMLParser.XMLParser().parse(xml)
+ out = xml_parser.xml_parser().parse(xml)
out["firstel"] (this will be firstdata )
out["secondel"]["subinsecond"] (this will be seconddata)
--
1.7.7.3
5:37 a.m.
New subject: [libvirt] [test-API 12/14] Rename utils/*.py with consistent naming style
On 04/19/2012 10:25 AM, Osier Yang wrote:
We use foo_bar across the project (except the main program), though
it might be not good to use "foo_bar" as the module name in Python,
but let's unify it first.
---
.../en-US/Understanding_libvirt-test-API.xml | 4 +-
.../en-US/Writing_a_test_case.xml | 8 ++--
libvirt-test-api | 8 ++--
repos/domain/attach_disk.py | 4 +-
repos/domain/attach_interface.py | 4 +-
repos/domain/create.py | 4 +-
repos/domain/define.py | 4 +-
repos/domain/detach_disk.py | 4 +-
repos/domain/detach_interface.py | 4 +-
repos/domain/install_image.py | 4 +-
repos/domain/install_linux_cdrom.py | 6 +-
repos/domain/install_linux_net.py | 6 +-
repos/domain/install_windows_cdrom.py | 6 +-
repos/domain/migrate.py | 2 +-
repos/domain/update_devflag.py | 6 +-
repos/interface/create.py | 2 +-
repos/interface/define.py | 4 +-
repos/interface/destroy.py | 2 +-
repos/interface/undefine.py | 2 +-
repos/network/create.py | 4 +-
repos/network/define.py | 4 +-
repos/npiv/create_virtual_hba.py | 4 +-
.../multiple_thread_block_on_domain_create.py | 4 +-
repos/snapshot/internal_create.py | 4 +-
repos/storage/activate_pool.py | 2 +-
repos/storage/create_dir_pool.py | 4 +-
repos/storage/create_dir_volume.py | 4 +-
repos/storage/create_fs_pool.py | 8 ++--
repos/storage/create_iscsi_pool.py | 4 +-
repos/storage/create_logical_volume.py | 4 +-
repos/storage/create_netfs_pool.py | 8 ++--
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_partition_volume.py | 2 +-
repos/storage/destroy_pool.py | 2 +-
src/logxmlparser.py | 2 +-
utils/{xmlbuilder.py => xml_builder.py} | 44 ++++++++++----------
utils/{xmlgenerator.py => xml_generator.py} | 2 +-
utils/{XMLParser.py => xml_parser.py} | 8 ++--
46 files changed, 117 insertions(+), 117 deletions(-)
rename utils/{xmlbuilder.py => xml_builder.py} (91%)
rename utils/{xmlgenerator.py => xml_generator.py} (99%)
rename utils/{XMLParser.py => xml_parser.py} (96%)
diff --git
a/docs/User_Guide/libvirt-test-API_Guide/en-US/Understanding_libvirt-test-API.xml
b/docs/User_Guide/libvirt-test-API_Guide/en-US/Understanding_libvirt-test-API.xml
index 7fe1e97..88c1b76 100644
--- a/docs/User_Guide/libvirt-test-API_Guide/en-US/Understanding_libvirt-test-API.xml
+++ b/docs/User_Guide/libvirt-test-API_Guide/en-US/Understanding_libvirt-test-API.xml
@@ -197,10 +197,10 @@ repos
<para><filename>/utils</filename> is a directory which
contains various scripts to assist in creating and verifying test cases.</para>
<!--<itemizedlist>
<listitem>
-<para><filename>xmlgenerator.py</filename>XML generator.</para>
+<para><filename>xml_generator.py</filename>XML
generator.</para>
</listitem>
<listitem>
-<para><filename>xmlbuilder.py</filename> builds a virtual machine
from an XML file.</para>
+<para><filename>xml_builder.py</filename> builds a virtual machine
from an XML file.</para>
</listitem>
<listitem>
<para>Random MAC address generator. Useful when installing a guest
machine.</para>
diff --git a/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml
b/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml
index 21c4ac6..2a74518 100644
--- a/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml
+++ b/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml
@@ -142,7 +142,7 @@ import exception
from lib import connectAPI
from lib import storageAPI
from utils import env_parser
-from utils import xmlbuilder
+from utils import xml_builder
envfile = 'env.ini'
@@ -154,7 +154,7 @@ def initialize_storage(dict):
dict['sourcepath'] = envparser.get_value('storage',
'sourcepath')
logger.info('prepare create storage pool')
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(dict)
logger.debug('dump create storage pool xml:\n%s' %poolxml)
@@ -201,7 +201,7 @@ import exception
from lib import connectAPI
from lib import domainAPI
from utils import env_parser
-from utils import xmlbuilder
+from utils import xml_builder
envfile = 'env.ini'
@@ -246,7 +246,7 @@ def install_guest(dict):
logger.info('prepare installation booting cdrom')
prepare_cdrom(url, dict['kickstart'], gname, logger)
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
guestinstxml = xmlobj.build_domain_install(dict)
logger.debug('dump installation guest xml:\n%s' %guestinstxml)
diff --git a/libvirt-test-api b/libvirt-test-api
index 7eaaf21..62e18f6 100755
--- a/libvirt-test-api
+++ b/libvirt-test-api
@@ -28,7 +28,7 @@ from src import generator
from src import env_clear
from src import process
from utils import log
-from src.logxmlparser import LogXMLParser
+from src.logxmlparser import Logxml_parser
from src.activityfilter import Filter
from src.casecfgcheck import CaseCfgCheck
@@ -93,7 +93,7 @@ class Main(object):
testrunid = time.strftime("%Y%m%d%H%M%S")
os.makedirs('log/%s' %testrunid)
- log_xml_parser = LogXMLParser(self.logxml)
+ log_xml_parser = Logxml_parser(self.logxml)
# If the specified log xmlfile exists, then append the testrun
# item of this time to the file, if not, create a new log xmlfile
@@ -256,7 +256,7 @@ class Main(object):
def remove_log(self, testrunid, testid = None):
""" to remove log item in the log xmlfile """
- log_xml_parser = LogXMLParser(self.logxml)
+ log_xml_parser = Logxml_parser(self.logxml)
# remove a test in a testrun
if testrunid and testid:
@@ -289,7 +289,7 @@ class Main(object):
def merge_logxmls(self, logxml_two):
""" to merge two log xml files of log into
one"""
- log_xml_parser = LogXMLParser(self.logxml)
+ log_xml_parser = Logxml_parser(self.logxml)
log_xml_parser.merge_xmlfiles(logxml_two)
print "Merge the second log xml file %s to %s successfully " % \
(logxml_two, self.logxml)
diff --git a/repos/domain/attach_disk.py b/repos/domain/attach_disk.py
index fc0e611..4711ad1 100644
--- a/repos/domain/attach_disk.py
+++ b/repos/domain/attach_disk.py
@@ -12,7 +12,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname',
'virt_type',
@@ -68,7 +68,7 @@ def attach_disk(params):
domobj = conn.lookupByName(guestname)
# Generate disk xml
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
diskxml = xmlobj.build_disk(params)
logger.debug("disk xml:\n%s" %diskxml)
diff --git a/repos/domain/attach_interface.py b/repos/domain/attach_interface.py
index 5c9c507..4d605f9 100644
--- a/repos/domain/attach_interface.py
+++ b/repos/domain/attach_interface.py
@@ -10,7 +10,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname', 'ifacetype', 'source',)
optional_params = ('hdmodel',)
@@ -40,7 +40,7 @@ def attach_interface(params):
domobj = conn.lookupByName(guestname)
# Generate interface xml
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
interfacexml = xmlobj.build_interface(params)
logger.debug("interface xml:\n%s" %interfacexml)
diff --git a/repos/domain/create.py b/repos/domain/create.py
index 9f2f5e1..ed96b36 100644
--- a/repos/domain/create.py
+++ b/repos/domain/create.py
@@ -11,7 +11,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
NONE = 0
START_PAUSED = 1
@@ -43,7 +43,7 @@ def create(params):
conn = sharedmod.libvirtobj['conn']
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
domain = xmlobj.add_domain(params)
xmlobj.add_disk(params, domain)
xmlobj.add_interface(params, domain)
diff --git a/repos/domain/define.py b/repos/domain/define.py
index dae1062..92a98f6 100644
--- a/repos/domain/define.py
+++ b/repos/domain/define.py
@@ -12,7 +12,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname', 'virt_type',)
optional_params = ('uuid',
@@ -70,7 +70,7 @@ def define(params):
logger.info("define domain on %s" % uri)
# Generate damain xml
- xml_obj = xmlbuilder.XmlBuilder()
+ xml_obj = xml_builder.XmlBuilder()
domain = xml_obj.add_domain(params)
xml_obj.add_disk(params, domain)
xml_obj.add_interface(params, domain)
diff --git a/repos/domain/detach_disk.py b/repos/domain/detach_disk.py
index da25c8f..d723474 100644
--- a/repos/domain/detach_disk.py
+++ b/repos/domain/detach_disk.py
@@ -11,7 +11,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname', 'virt_type', 'imagename',
'hdmodel',)
optional_params = ()
@@ -45,7 +45,7 @@ def detach_disk(params):
domobj = conn.lookupByName(guestname)
# Detach disk
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
diskxml = xmlobj.build_disk(params)
logger.debug("disk xml:\n%s" %diskxml)
diff --git a/repos/domain/detach_interface.py b/repos/domain/detach_interface.py
index c444b68..82deffb 100644
--- a/repos/domain/detach_interface.py
+++ b/repos/domain/detach_interface.py
@@ -11,7 +11,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname', 'ifacetype', 'source',
'nicmodel',)
optional_params = ()
@@ -47,7 +47,7 @@ def detach_interface(params):
conn = sharedmod.libvirtobj['conn']
domobj = conn.lookupByName(guestname)
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
ifacexml = xmlobj.build_interface(params)
logger.debug("interface xml:\n%s" % ifacexml)
diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py
index 2ab97a0..be36b03 100644
--- a/repos/domain/install_image.py
+++ b/repos/domain/install_image.py
@@ -13,7 +13,7 @@ from libvirt import libvirtError
from src import sharedmod
from src import env_parser
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
HOME_PATH = os.getcwd()
@@ -72,7 +72,7 @@ def install_image(params):
conn = sharedmod.libvirtobj['conn']
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
domain = xmlobj.add_domain(params)
xmlobj.add_disk(params, domain)
diff --git a/repos/domain/install_linux_cdrom.py b/repos/domain/install_linux_cdrom.py
index 235f587..ee3c397 100644
--- a/repos/domain/install_linux_cdrom.py
+++ b/repos/domain/install_linux_cdrom.py
@@ -16,7 +16,7 @@ from libvirt import libvirtError
from src import sharedmod
from src import env_parser
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname', 'virt_type', 'guestos',
'guestarch',)
optional_params = ('uuid',
@@ -93,7 +93,7 @@ def prepare_boot_guest(domobj, dict, logger, installtype):
guestname = params['guestname']
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
domain = xmlobj.add_domain(params)
xmlobj.add_disk(params, domain)
@@ -258,7 +258,7 @@ def install_linux_cdrom(params):
logger.error("unknown virt type: %s" % virt_type)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
guestxml = xmlobj.build_domain_install(params)
logger.debug('dump installation guest xml:\n%s' % guestxml)
diff --git a/repos/domain/install_linux_net.py b/repos/domain/install_linux_net.py
index 9841eed..105c0ea 100644
--- a/repos/domain/install_linux_net.py
+++ b/repos/domain/install_linux_net.py
@@ -16,7 +16,7 @@ from libvirt import libvirtError
from src import sharedmod
from src import env_parser
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname', 'virt_type', 'guestos',
'guestarch','netmethod',)
optional_params = ('uuid',
@@ -50,7 +50,7 @@ def prepare_boot_guest(domobj, dict, logger, installtype):
guestname = params['guestname']
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
domain = xmlobj.add_domain(params)
xmlobj.add_disk(params, domain)
@@ -240,7 +240,7 @@ def install_linux_net(params):
logger.error("unknown virt type %s" % virt_type)
# Prepare guest installation xml
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
guestxml = xmlobj.build_domain_install(params)
logger.debug('dump installation guest xml:\n%s' % guestxml)
diff --git a/repos/domain/install_windows_cdrom.py
b/repos/domain/install_windows_cdrom.py
index 6cec08a..825aa29 100644
--- a/repos/domain/install_windows_cdrom.py
+++ b/repos/domain/install_windows_cdrom.py
@@ -15,7 +15,7 @@ from libvirt import libvirtError
from src import sharedmod
from src import env_parser
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
VIRSH_QUIET_LIST = "virsh --quiet list --all|awk '{print $2}'|grep
\"^%s$\""
VM_STAT = "virsh --quiet list --all| grep \"\\b%s\\b\"|grep off"
@@ -152,7 +152,7 @@ def prepare_boot_guest(domobj, dict, installtype):
guestname = params['guestname']
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
domain = xmlobj.add_domain(params)
xmlobj.add_disk(params, domain)
@@ -285,7 +285,7 @@ def install_windows_cdrom(params):
return 1
params['floppysource'] = FLOOPY_IMG
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
guestxml = xmlobj.build_domain_install_win(params)
logger.debug('dump installation guest xml:\n%s' % guestxml)
diff --git a/repos/domain/migrate.py b/repos/domain/migrate.py
index 2e6b40d..7a38a29 100644
--- a/repos/domain/migrate.py
+++ b/repos/domain/migrate.py
@@ -11,7 +11,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('transport',
'target_machine',
diff --git a/repos/domain/update_devflag.py b/repos/domain/update_devflag.py
index 9286918..6c75fd6 100644
--- a/repos/domain/update_devflag.py
+++ b/repos/domain/update_devflag.py
@@ -12,7 +12,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname', 'devtype', 'username',
'password',)
optional_params = ()
@@ -192,7 +192,7 @@ def update_devflag(params):
guestobj = minidom.parseString(guestxml)
# Generat device XML for original use
- origxmlobj = xmlbuilder.XmlBuilder()
+ origxmlobj = xml_builder.XmlBuilder()
if devtype == 'cdrom':
origxmlobj.add_cdrom(xmlargs, guestobj)
@@ -217,7 +217,7 @@ def update_devflag(params):
return 1
# Generate device XML for updating
- newxmlobj = xmlbuilder.XmlBuilder()
+ newxmlobj = xml_builder.XmlBuilder()
if devtype == 'cdrom':
xmlargs['bootcd'] = '/var/lib/libvirt/boot/cdrom-new.img'
diff --git a/repos/interface/create.py b/repos/interface/create.py
index 9df3464..3afcafb 100644
--- a/repos/interface/create.py
+++ b/repos/interface/create.py
@@ -10,7 +10,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('ifacename',)
optional_params = ()
diff --git a/repos/interface/define.py b/repos/interface/define.py
index 630ae45..4d39e6a 100644
--- a/repos/interface/define.py
+++ b/repos/interface/define.py
@@ -8,7 +8,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('ifacename', 'ifacetype',)
optional_params = ()
@@ -37,7 +37,7 @@ def define(params):
logger.error("interface %s have been defined" % ifacename)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
iface_xml = xmlobj.build_host_interface(params)
logger.debug("interface xml:\n%s" %iface_xml)
diff --git a/repos/interface/destroy.py b/repos/interface/destroy.py
index 7dc0320..4dcfc73 100644
--- a/repos/interface/destroy.py
+++ b/repos/interface/destroy.py
@@ -10,7 +10,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('ifacename',)
optional_params = ()
diff --git a/repos/interface/undefine.py b/repos/interface/undefine.py
index 757d3f9..85d4489 100644
--- a/repos/interface/undefine.py
+++ b/repos/interface/undefine.py
@@ -8,7 +8,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('ifacename',)
optional_params = ()
diff --git a/repos/network/create.py b/repos/network/create.py
index d50c84d..8fc87a2 100644
--- a/repos/network/create.py
+++ b/repos/network/create.py
@@ -10,7 +10,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('networkname',
'bridgename',
@@ -46,7 +46,7 @@ def create(params):
logger.error("the %s network is running" % networkname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
netxml = xmlobj.build_network(params)
logger.debug("%s network xml:\n%s" % (networkname, netxml))
diff --git a/repos/network/define.py b/repos/network/define.py
index 8c02d2a..beafe1d 100644
--- a/repos/network/define.py
+++ b/repos/network/define.py
@@ -10,7 +10,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('networkname',
'bridgename',
@@ -49,7 +49,7 @@ def define(params):
logger.error("%s network is defined" % networkname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
netxml = xmlobj.build_network(params)
logger.debug("network xml:\n%s" % netxml)
diff --git a/repos/npiv/create_virtual_hba.py b/repos/npiv/create_virtual_hba.py
index a558fbc..a5005ca 100644
--- a/repos/npiv/create_virtual_hba.py
+++ b/repos/npiv/create_virtual_hba.py
@@ -6,7 +6,7 @@ import sys
import re
import commands
import xml.dom.minidom
-from utils import xmlbuilder
+from utils import xml_builder
import libvirt
from libvirt import libvirtError
@@ -70,7 +70,7 @@ def create_virtual_hba(params):
else:
logger.info("No NPIV capabilities on '%s'" % fc_name)
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
nodedev_xml = xmlobj.build_nodedev(params)
logger.debug("node device xml:\n%s" % nodedev_xml)
diff --git a/repos/regression/multiple_thread_block_on_domain_create.py
b/repos/regression/multiple_thread_block_on_domain_create.py
index a72fdaf..1c85706 100644
--- a/repos/regression/multiple_thread_block_on_domain_create.py
+++ b/repos/regression/multiple_thread_block_on_domain_create.py
@@ -16,7 +16,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
from utils import env_parser
-from utils import xmlbuilder
+from utils import xml_builder
IMAG_PATH = "/var/lib/libvirt/images/"
DISK_DD = "dd if=/dev/zero of=%s bs=1 count=1 seek=6G"
@@ -76,7 +76,7 @@ class guest_install(Thread):
else:
self.logger.info("creating disk images file is successful.")
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
guestxml = xmlobj.build_domain_install(guest_params)
self.logger.debug("guestxml is %s" % guestxml)
self.logger.info('create guest %sfrom xml description' % self.name)
diff --git a/repos/snapshot/internal_create.py b/repos/snapshot/internal_create.py
index d0f3906..6ddf350 100644
--- a/repos/snapshot/internal_create.py
+++ b/repos/snapshot/internal_create.py
@@ -11,7 +11,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('guestname',)
optional_params = ('snapshotname',)
@@ -63,7 +63,7 @@ def internal_create(params):
logger.error("checking failed")
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
snapshot_xml = xmlobj.build_domain_snapshot(params)
logger.debug("%s snapshot xml:\n%s" % (guestname, snapshot_xml))
diff --git a/repos/storage/activate_pool.py b/repos/storage/activate_pool.py
index 3954457..51aa7fc 100644
--- a/repos/storage/activate_pool.py
+++ b/repos/storage/activate_pool.py
@@ -9,7 +9,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname',)
optional_params = ()
diff --git a/repos/storage/create_dir_pool.py b/repos/storage/create_dir_pool.py
index 067ae92..5747585 100644
--- a/repos/storage/create_dir_pool.py
+++ b/repos/storage/create_dir_pool.py
@@ -9,7 +9,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'pooltype',)
optional_params = ()
@@ -45,7 +45,7 @@ def create_dir_pool(params):
logger.error("%s storage pool has already been created" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/create_dir_volume.py b/repos/storage/create_dir_volume.py
index 155eb3b..41fb270 100644
--- a/repos/storage/create_dir_volume.py
+++ b/repos/storage/create_dir_volume.py
@@ -11,7 +11,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'volname', 'volformat',
'capacity',)
optional_params = ()
@@ -112,7 +112,7 @@ def create_dir_volume(params):
the volume information in the pool %s" % poolname)
virsh_vol_list(poolname)
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
volumexml = xmlobj.build_volume(params)
logger.debug("volume xml:\n%s" % volumexml)
diff --git a/repos/storage/create_fs_pool.py b/repos/storage/create_fs_pool.py
index 7daf5f6..9bff2c7 100644
--- a/repos/storage/create_fs_pool.py
+++ b/repos/storage/create_fs_pool.py
@@ -9,8 +9,8 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
-from utils import XMLParser
+from utils import xml_builder
+from utils import xml_parser
required_params = ('poolname', 'sourcepath', 'pooltype',)
optional_params = ('sourceformat',)
@@ -30,7 +30,7 @@ def check_pool_create_libvirt(conn, poolname, logger):
def check_pool_create_OS(poolobj, logger):
"""Check the result of create storage pool on OS level.
"""
poolxml = poolobj.XMLDesc(0)
- out = XMLParser.XMLParser().parse(poolxml)
+ out = xml_parser.xml_parser().parse(poolxml)
src_path =
out["source"]["device"]["attr"]["path"]
dest_path = out["target"]["path"]
logger.info("src path: %s tgt path: %s" % (src_path, dest_path))
@@ -64,7 +64,7 @@ def create_fs_pool(params):
logger.error("%s storage pool has already been created" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/create_iscsi_pool.py b/repos/storage/create_iscsi_pool.py
index f108a59..85428cd 100644
--- a/repos/storage/create_iscsi_pool.py
+++ b/repos/storage/create_iscsi_pool.py
@@ -8,7 +8,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'sourcename', 'sourcepath',
'pooltype',)
optional_params = ()
@@ -44,7 +44,7 @@ def create_iscsi_pool(params):
logger.error("%s storage pool has already been created" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/create_logical_volume.py
b/repos/storage/create_logical_volume.py
index 714480c..294ac73 100644
--- a/repos/storage/create_logical_volume.py
+++ b/repos/storage/create_logical_volume.py
@@ -12,7 +12,7 @@ from libvirt import libvirtError
from src import sharedmod
from utils import utils
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'pooltype', 'volname',
'capacity',)
optional_params = ()
@@ -101,7 +101,7 @@ def create_logical_volume(params):
params['volpath'] = "%s/%s" % (poolpath, volname)
logger.debug("volume target path: %s" % params['volpath'])
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
volxml = xmlobj.build_volume(params)
logger.debug("storage volume xml:\n%s" % volxml)
diff --git a/repos/storage/create_netfs_pool.py b/repos/storage/create_netfs_pool.py
index 2a0cd23..e16ea63 100644
--- a/repos/storage/create_netfs_pool.py
+++ b/repos/storage/create_netfs_pool.py
@@ -9,8 +9,8 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
-from utils import XMLParser
+from utils import xml_builder
+from utils import xml_parser
required_params = ('poolname', 'sourcename', 'sourcepath',
'pooltype',)
optional_params = ('targetpath',)
@@ -36,7 +36,7 @@ def check_pool_create_OS(conn, poolname, logger):
poolobj = conn.storagePoolLookupByName(poolname)
poolxml = poolobj.XMLDesc(0)
# parse the xml to see where this is mounted...
- out = XMLParser.XMLParser().parse(poolxml)
+ out = xml_parser.xml_parser().parse(poolxml)
dest_path = out["target"]["path"]
src_host =
out["source"]["host"]["attr"]["name"]
src_path =
out["source"]["dir"]["attr"]["path"]
@@ -71,7 +71,7 @@ def create_netfs_pool(params):
logger.error("%s storage pool has already been created" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/create_netfs_volume.py b/repos/storage/create_netfs_volume.py
index e5f711a..da96f53 100644
--- a/repos/storage/create_netfs_volume.py
+++ b/repos/storage/create_netfs_volume.py
@@ -11,7 +11,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'volname', 'volformat',
'capacity',)
optional_params = ()
@@ -112,7 +112,7 @@ def create_netfs_volume(params):
ouput the volume information in the pool %s" % poolname)
virsh_vol_list(poolname)
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
volumexml = xmlobj.build_volume(params)
logger.debug("volume xml:\n%s" % volumexml)
diff --git a/repos/storage/create_partition_volume.py
b/repos/storage/create_partition_volume.py
index 3ba802b..317697e 100644
--- a/repos/storage/create_partition_volume.py
+++ b/repos/storage/create_partition_volume.py
@@ -10,7 +10,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'volname', 'volformat',
'capacity',)
optional_params = ()
@@ -82,7 +82,7 @@ def create_partition_volume(params):
ouput the volume information in the pool %s" % poolname)
virsh_vol_list(poolname)
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
volumexml = xmlobj.build_volume(params)
logger.debug("volume xml:\n%s" % volumexml)
diff --git a/repos/storage/define_dir_pool.py b/repos/storage/define_dir_pool.py
index b45767d..0c8dbb7 100644
--- a/repos/storage/define_dir_pool.py
+++ b/repos/storage/define_dir_pool.py
@@ -10,7 +10,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
VIRSH_POOLLIST = "virsh --quiet pool-list --all|awk '{print $1}'|grep
\"^%s$\""
POOL_STAT = "virsh --quiet pool-list --all|grep \"^%s\\b\" |grep
\"inactive\""
@@ -53,7 +53,7 @@ def define_dir_pool(params):
logger.error("%s storage pool is defined" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/define_disk_pool.py b/repos/storage/define_disk_pool.py
index 619292f..56a2f09 100644
--- a/repos/storage/define_disk_pool.py
+++ b/repos/storage/define_disk_pool.py
@@ -9,7 +9,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'pooltype', 'sourcepath',)
optional_params = ('sourceformat', 'targetpath',)
@@ -54,7 +54,7 @@ def define_disk_pool(params):
logger.error("%s storage pool is defined" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/define_iscsi_pool.py b/repos/storage/define_iscsi_pool.py
index fdb09a2..1a1e247 100644
--- a/repos/storage/define_iscsi_pool.py
+++ b/repos/storage/define_iscsi_pool.py
@@ -9,7 +9,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'pooltype', 'sourcename',
'sourcepath',)
optional_params = ()
@@ -57,7 +57,7 @@ def define_iscsi_pool(params):
logger.error("%s storage pool is ALREADY defined" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/define_logical_pool.py b/repos/storage/define_logical_pool.py
index ebbdc76..869f2c5 100644
--- a/repos/storage/define_logical_pool.py
+++ b/repos/storage/define_logical_pool.py
@@ -9,7 +9,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'pooltype', 'sourcename',
'sourcepath',)
optional_params = ()
@@ -42,7 +42,7 @@ def define_logical_pool(params):
logger.error("%s storage pool is defined" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/define_mpath_pool.py b/repos/storage/define_mpath_pool.py
index 930f9b8..0780706 100644
--- a/repos/storage/define_mpath_pool.py
+++ b/repos/storage/define_mpath_pool.py
@@ -8,7 +8,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'pooltype',)
optional_params = ('targetpath',)
@@ -50,7 +50,7 @@ def define_mpath_pool(params):
logger.error("%s storage pool is defined" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/define_netfs_pool.py b/repos/storage/define_netfs_pool.py
index e607da2..d0fdf12 100644
--- a/repos/storage/define_netfs_pool.py
+++ b/repos/storage/define_netfs_pool.py
@@ -9,7 +9,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'pooltype', 'sourcename',
'sourcepath',)
optional_params = ('targetpath',)
@@ -42,7 +42,7 @@ def define_netfs_pool(params):
logger.error("%s storage pool is defined" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/define_scsi_pool.py b/repos/storage/define_scsi_pool.py
index 8be591a..c486a95 100644
--- a/repos/storage/define_scsi_pool.py
+++ b/repos/storage/define_scsi_pool.py
@@ -9,7 +9,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'pooltype', 'sourcename',)
optional_params = ('targetpath',)
@@ -54,7 +54,7 @@ def define_scsi_pool(params):
logger.error("%s storage pool is defined" % poolname)
return 1
- xmlobj = xmlbuilder.XmlBuilder()
+ xmlobj = xml_builder.XmlBuilder()
poolxml = xmlobj.build_pool(params)
logger.debug("storage pool xml:\n%s" % poolxml)
diff --git a/repos/storage/delete_partition_volume.py
b/repos/storage/delete_partition_volume.py
index b70ff45..17a4cd9 100644
--- a/repos/storage/delete_partition_volume.py
+++ b/repos/storage/delete_partition_volume.py
@@ -9,7 +9,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname', 'volname',)
optional_params = ()
diff --git a/repos/storage/destroy_pool.py b/repos/storage/destroy_pool.py
index 304f1bb..8566a84 100644
--- a/repos/storage/destroy_pool.py
+++ b/repos/storage/destroy_pool.py
@@ -8,7 +8,7 @@ import libvirt
from libvirt import libvirtError
from src import sharedmod
-from utils import xmlbuilder
+from utils import xml_builder
required_params = ('poolname',)
optional_params = ()
diff --git a/src/logxmlparser.py b/src/logxmlparser.py
index 3b377ce..36d743e 100644
--- a/src/logxmlparser.py
+++ b/src/logxmlparser.py
@@ -24,7 +24,7 @@ from xml.dom.minidom import Document
from src import exception
-class LogXMLParser(object):
+class Logxml_parser(object):
""" Generate and parser log xml file
"""
def __init__(self, logxml):
diff --git a/utils/xmlbuilder.py b/utils/xml_builder.py
similarity index 91%
rename from utils/xmlbuilder.py
rename to utils/xml_builder.py
index 85cda03..435aa84 100644
--- a/utils/xmlbuilder.py
+++ b/utils/xml_builder.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# xmlbuilder.py: Class for building XML for libvirt objects.
+# xml_builder.py: Class for building XML for libvirt objects.
#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
@@ -21,7 +21,7 @@ __DEBUG__ = False
import os, sys
import xml.dom.minidom
-import xmlgenerator
+import xml_generator
class XmlBuilder:
"""Operation for building domain xml"""
@@ -29,43 +29,43 @@ class XmlBuilder:
print doc.toprettyxml()
def add_domain(self, params):
- domain = xmlgenerator.domain_xml(params)
+ domain = xml_generator.domain_xml(params)
return domain
def add_disk(self, params, domain):
- disk = xmlgenerator.disk_xml(params)
+ disk = xml_generator.disk_xml(params)
disk_node = domain.importNode(disk.childNodes[0], True)
domain.getElementsByTagName("devices")[0].insertBefore(
disk_node, domain.getElementsByTagName("console")[0])
def add_floppy(self, params, domain):
- floppy = xmlgenerator.floppy_xml(params)
+ floppy = xml_generator.floppy_xml(params)
floppy_node = domain.importNode(floppy.childNodes[0], True)
domain.getElementsByTagName("devices")[0].insertBefore(
floppy_node, domain.getElementsByTagName("console")[0])
def add_cdrom(self, params, domain):
- cdrom = xmlgenerator.disk_xml(params, True)
+ cdrom = xml_generator.disk_xml(params, True)
cdrom_node = domain.importNode(cdrom.childNodes[0], True)
domain.getElementsByTagName("devices")[0].insertBefore(
cdrom_node, domain.getElementsByTagName("console")[0])
def add_interface(self, params, domain):
- interface = xmlgenerator.interface_xml(params)
+ interface = xml_generator.interface_xml(params)
interface_node = domain.importNode(interface.childNodes[0], True)
domain.getElementsByTagName("devices")[0].insertBefore(
interface_node, domain.getElementsByTagName("console")[0])
return interface
def add_hostdev(self, params, domain):
- hostdev = xmlgenerator.hostdev_xml(params)
+ hostdev = xml_generator.hostdev_xml(params)
hostdev_node = domain.importNode(hostdev.childNodes[0], True)
domain.getElementsByTagName("devices")[0].insertBefore(
hostdev_node, domain.getElementsByTagName("console")[0])
return hostdev
def build_domain_install(self, params):
- domain = xmlgenerator.domain_xml(params, True)
+ domain = xml_generator.domain_xml(params, True)
self.add_disk(params, domain)
if params['virt_type'] != 'xenpv':
if params.has_key('bootcd'):
@@ -76,7 +76,7 @@ class XmlBuilder:
return domain.toxml()
def build_domain_install_win(self, params):
- domain = xmlgenerator.domain_xml(params, True)
+ domain = xml_generator.domain_xml(params, True)
self.add_disk(params, domain)
self.add_floppy(params, domain)
if params.has_key('bootcd'):
@@ -102,7 +102,7 @@ class XmlBuilder:
else:
print 'Wrong harddisk model.'
- disk = xmlgenerator.disk_xml(params)
+ disk = xml_generator.disk_xml(params)
if params['virt_type'] == 'xenpv':
disk.getElementsByTagName("target")[0].setAttribute("dev",
"xvdb")
else:
@@ -123,7 +123,7 @@ class XmlBuilder:
else:
print 'Wrong cdrom model.'
- cdrom = xmlgenerator.disk_xml(params, True)
+ cdrom = xml_generator.disk_xml(params, True)
if params['virt_type'] == 'xenpv':
cdrom.getElementsByTagName("target")[0].setAttribute("dev",
"xvdc")
else:
@@ -134,61 +134,61 @@ class XmlBuilder:
return cdrom.toxml()
def build_floppy(self, params):
- floppy = xmlgenerator.floppy_xml(params)
+ floppy = xml_generator.floppy_xml(params)
if __DEBUG__:
self.write_toxml(floppy)
return floppy.toxml()
def build_interface(self, params):
- interface = xmlgenerator.interface_xml(params)
+ interface = xml_generator.interface_xml(params)
if __DEBUG__:
self.write_toxml(interface)
return interface.toxml()
def build_hostdev(self, params):
- hostdev = xmlgenerator.hostdev_xml(params)
+ hostdev = xml_generator.hostdev_xml(params)
if __DEBUG__:
self.write_toxml(hostdev)
return hostdev.toxml()
def build_pool(self, params):
- pool = xmlgenerator.pool_xml(params)
+ pool = xml_generator.pool_xml(params)
if __DEBUG__:
self.write_toxml(pool)
return pool.toxml()
def build_volume(self, params):
- volume = xmlgenerator.volume_xml(params)
+ volume = xml_generator.volume_xml(params)
if __DEBUG__:
self.write_toxml(volume)
return volume.toxml()
def build_network(self, params):
- network = xmlgenerator.network_xml(params)
+ network = xml_generator.network_xml(params)
if __DEBUG__:
self.write_toxml(network)
return network.toxml()
def build_host_interface(self, params):
- interface = xmlgenerator.host_iface_xml(params)
+ interface = xml_generator.host_iface_xml(params)
if __DEBUG__:
self.write_toxml(interface)
return interface.toxml()
def build_domain_snapshot(self, params):
- snapshot = xmlgenerator.snapshot_xml(params)
+ snapshot = xml_generator.snapshot_xml(params)
if __DEBUG__:
self.write_toxml(snapshot)
return snapshot.toxml()
def build_secret(self, params):
- secret = xmlgenerator.secret_xml(params)
+ secret = xml_generator.secret_xml(params)
if __DEBUG__:
self.write_toxml(secret)
return secret.toxml()
def build_nodedev(self, params):
- nodedev = xmlgenerator.nodedev_xml(params)
+ nodedev = xml_generator.nodedev_xml(params)
if __DEBUG__:
self.write_toxml(nodedev)
return nodedev.toxml()
diff --git a/utils/xmlgenerator.py b/utils/xml_generator.py
similarity index 99%
rename from utils/xmlgenerator.py
rename to utils/xml_generator.py
index c2bdec5..e173543 100644
--- a/utils/xmlgenerator.py
+++ b/utils/xml_generator.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# xmlgenerator.py: Generate XML for libvirt objects.
+# xml_generator.py: Generate XML for libvirt objects.
#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
diff --git a/utils/XMLParser.py b/utils/xml_parser.py
similarity index 96%
rename from utils/XMLParser.py
rename to utils/xml_parser.py
index 20a376e..04e7501 100644
--- a/utils/XMLParser.py
+++ b/utils/xml_parser.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# XMLParser.py: Parse XML document, the result is a python dict.
+# xml_parser.py: Parse XML document, the result is a python dict.
#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
@@ -21,8 +21,8 @@ import os
from xml.dom import minidom
import StringIO
-class XMLParser(object):
- """Class XMLParser. It parses and xml document into a python
dictionary.
+class xml_parser(object):
+ """Class xml_parser. It parses and xml document into a python
dictionary.
The elements of the xml documents will be python dictionary keys. For
example, the xml document:
<firstel>firstdata</firstel>
@@ -32,7 +32,7 @@ class XMLParser(object):
will be parsed into the python dictionary:
{ "firstel":"firstdata" ,
"secondel":{"subsinsecond":"seconddata"} }
Then the data can be retrieve as:
- out = XMLParser.XMLParser().parse(xml)
+ out = xml_parser.xml_parser().parse(xml)
out["firstel"] (this will be firstdata )
out["secondel"]["subinsecond"] (this will be seconddata)
ACK
Guannan Ren
9:25 p.m.
New subject: [libvirt] [test-API 13/14] Rename src/logxmlparser.py as src/log_generator.py
From the codes, it's to generator the output log in XML format,
but not to parse. The class name is also changed from "Logxml_parser"
to "LogGenerator".
---
libvirt-test-api | 8 ++++----
src/{logxmlparser.py => log_generator.py} | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
rename src/{logxmlparser.py => log_generator.py} (99%)
diff --git a/libvirt-test-api b/libvirt-test-api
index 62e18f6..a409556 100755
--- a/libvirt-test-api
+++ b/libvirt-test-api
@@ -28,7 +28,7 @@ from src import generator
from src import env_clear
from src import process
from utils import log
-from src.logxmlparser import Logxml_parser
+from src.log_generator import LogGenerator
from src.activityfilter import Filter
from src.casecfgcheck import CaseCfgCheck
@@ -93,7 +93,7 @@ class Main(object):
testrunid = time.strftime("%Y%m%d%H%M%S")
os.makedirs('log/%s' %testrunid)
- log_xml_parser = Logxml_parser(self.logxml)
+ log_xml_parser = LogGenerator(self.logxml)
# If the specified log xmlfile exists, then append the testrun
# item of this time to the file, if not, create a new log xmlfile
@@ -256,7 +256,7 @@ class Main(object):
def remove_log(self, testrunid, testid = None):
""" to remove log item in the log xmlfile """
- log_xml_parser = Logxml_parser(self.logxml)
+ log_xml_parser = LogGenerator(self.logxml)
# remove a test in a testrun
if testrunid and testid:
@@ -289,7 +289,7 @@ class Main(object):
def merge_logxmls(self, logxml_two):
""" to merge two log xml files of log into one"""
- log_xml_parser = Logxml_parser(self.logxml)
+ log_xml_parser = LogGenerator(self.logxml)
log_xml_parser.merge_xmlfiles(logxml_two)
print "Merge the second log xml file %s to %s successfully " % \
(logxml_two, self.logxml)
diff --git a/src/logxmlparser.py b/src/log_generator.py
similarity index 99%
rename from src/logxmlparser.py
rename to src/log_generator.py
index 36d743e..a001ef2 100644
--- a/src/logxmlparser.py
+++ b/src/log_generator.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# logxmlparser.py: Generate output log file in XML format.
+# log_generator.py: Generate output log file in XML format.
# Copyright (C) 2010-2012 Red Hat, Inc.
#
@@ -24,7 +24,7 @@ from xml.dom.minidom import Document
from src import exception
-class Logxml_parser(object):
+class LogGenerator(object):
""" Generate and parser log xml file
"""
def __init__(self, logxml):
--
1.7.7.3
5:38 a.m.
New subject: [libvirt] [test-API 13/14] Rename src/logxmlparser.py as src/log_generator.py
On 04/19/2012 10:25 AM, Osier Yang wrote:
> From the codes, it's to generator the output log in XML
format,
but not to parse. The class name is also changed from "Logxml_parser"
to "LogGenerator".
---
libvirt-test-api | 8 ++++----
src/{logxmlparser.py => log_generator.py} | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
rename src/{logxmlparser.py => log_generator.py} (99%)
diff --git a/libvirt-test-api b/libvirt-test-api
index 62e18f6..a409556 100755
--- a/libvirt-test-api
+++ b/libvirt-test-api
@@ -28,7 +28,7 @@ from src import generator
from src import env_clear
from src import process
from utils import log
-from src.logxmlparser import Logxml_parser
+from src.log_generator import LogGenerator
from src.activityfilter import Filter
from src.casecfgcheck import CaseCfgCheck
@@ -93,7 +93,7 @@ class Main(object):
testrunid = time.strftime("%Y%m%d%H%M%S")
os.makedirs('log/%s' %testrunid)
- log_xml_parser = Logxml_parser(self.logxml)
+ log_xml_parser = LogGenerator(self.logxml)
# If the specified log xmlfile exists, then append the testrun
# item of this time to the file, if not, create a new log xmlfile
@@ -256,7 +256,7 @@ class Main(object):
def remove_log(self, testrunid, testid = None):
""" to remove log item in the log xmlfile """
- log_xml_parser = Logxml_parser(self.logxml)
+ log_xml_parser = LogGenerator(self.logxml)
# remove a test in a testrun
if testrunid and testid:
@@ -289,7 +289,7 @@ class Main(object):
def merge_logxmls(self, logxml_two):
""" to merge two log xml files of log into
one"""
- log_xml_parser = Logxml_parser(self.logxml)
+ log_xml_parser = LogGenerator(self.logxml)
log_xml_parser.merge_xmlfiles(logxml_two)
print "Merge the second log xml file %s to %s successfully " % \
(logxml_two, self.logxml)
diff --git a/src/logxmlparser.py b/src/log_generator.py
similarity index 99%
rename from src/logxmlparser.py
rename to src/log_generator.py
index 36d743e..a001ef2 100644
--- a/src/logxmlparser.py
+++ b/src/log_generator.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# logxmlparser.py: Generate output log file in XML format.
+# log_generator.py: Generate output log file in XML format.
# Copyright (C) 2010-2012 Red Hat, Inc.
#
@@ -24,7 +24,7 @@ from xml.dom.minidom import Document
from src import exception
-class Logxml_parser(object):
+class LogGenerator(object):
""" Generate and parser log xml file
"""
def __init__(self, logxml):
ACK
Guannan Ren
9:25 p.m.
New subject: [libvirt] [test-API 14/14] Rename 'env.cfg' as 'global.cfg'
It's not only about environment actually, many default settings are
defined in it.
---
env.cfg => global.cfg | 0
repos/domain/install_image.py | 2 +-
repos/domain/install_linux_cdrom.py | 2 +-
repos/domain/install_linux_check.py | 2 +-
repos/domain/install_linux_net.py | 4 ++--
repos/domain/install_windows_cdrom.py | 6 +++---
.../multiple_thread_block_on_domain_create.py | 2 +-
src/env_parser.py | 2 +-
src/exception.py | 2 +-
src/generator.py | 2 +-
src/parser.py | 4 ++--
11 files changed, 14 insertions(+), 14 deletions(-)
rename env.cfg => global.cfg (100%)
diff --git a/env.cfg b/global.cfg
similarity index 100%
rename from env.cfg
rename to global.cfg
diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py
index be36b03..e94ebc7 100644
--- a/repos/domain/install_image.py
+++ b/repos/domain/install_image.py
@@ -60,7 +60,7 @@ def install_image(params):
logger.info("the path of directory of disk images located on is %s" %
imgfullpath)
- envfile = os.path.join(HOME_PATH, 'env.cfg')
+ envfile = os.path.join(HOME_PATH, 'global.cfg')
logger.info("the environment file is %s" % envfile)
envparser = env_parser.Envparser(envfile)
diff --git a/repos/domain/install_linux_cdrom.py b/repos/domain/install_linux_cdrom.py
index ee3c397..1d5fb28 100644
--- a/repos/domain/install_linux_cdrom.py
+++ b/repos/domain/install_linux_cdrom.py
@@ -223,7 +223,7 @@ def install_linux_cdrom(params):
logger.info("creating disk images file is successful.")
logger.info("get system environment information")
- envfile = os.path.join(HOME_PATH, 'env.cfg')
+ envfile = os.path.join(HOME_PATH, 'global.cfg')
logger.info("the environment file is %s" % envfile)
envparser = env_parser.Envparser(envfile)
diff --git a/repos/domain/install_linux_check.py b/repos/domain/install_linux_check.py
index 303ab7f..74b8819 100644
--- a/repos/domain/install_linux_check.py
+++ b/repos/domain/install_linux_check.py
@@ -148,7 +148,7 @@ def install_linux_check(params):
# Check app works fine in guest, such as: wget
logger.info("check point5: check app works fine in guest, such as: wget")
logger.info("get system environment information")
- envfile = os.path.join(HOME_PATH, 'env.cfg')
+ envfile = os.path.join(HOME_PATH, 'global.cfg')
logger.info("the environment file is %s" % envfile)
envparser = env_parser.Envparser(envfile)
diff --git a/repos/domain/install_linux_net.py b/repos/domain/install_linux_net.py
index 105c0ea..a47bcea 100644
--- a/repos/domain/install_linux_net.py
+++ b/repos/domain/install_linux_net.py
@@ -188,13 +188,13 @@ def install_linux_net(params):
logger.info("get system environment information")
- envfile = os.path.join(HOME_PATH, 'env.cfg')
+ envfile = os.path.join(HOME_PATH, 'global.cfg')
logger.info("the environment file is %s" % envfile)
envparser = env_parser.Envparser(envfile)
# Get http, ftp or nfs url based on guest os, arch
- # and installation method from env.cfg
+ # and installation method from global.cfg
if installmethod == 'http':
ks = envparser.get_value("guest", guestos + "_" + guestarch
+
diff --git a/repos/domain/install_windows_cdrom.py
b/repos/domain/install_windows_cdrom.py
index 825aa29..402fa25 100644
--- a/repos/domain/install_windows_cdrom.py
+++ b/repos/domain/install_windows_cdrom.py
@@ -256,10 +256,10 @@ def install_windows_cdrom(params):
logger.info("creating disk images file is successful.")
logger.info("get system environment information")
- envfile = os.path.join(HOME_PATH, 'env.cfg')
+ envfile = os.path.join(HOME_PATH, 'global.cfg')
logger.info("the environment file is %s" % envfile)
- # Get iso file based on guest os and arch from env.cfg
+ # Get iso file based on guest os and arch from global.cfg
envparser = env_parser.Envparser(envfile)
iso_file = envparser.get_value("guest", guestos + '_' + guestarch)
cdkey = envparser.get_value("guest", "%s_%s_key" % (guestos,
guestarch))
@@ -427,7 +427,7 @@ def install_windows_cdrom_clean(params):
guestos = params.get('guestos')
guestarch = params.get('guestarch')
- envfile = os.path.join(HOME_PATH, 'env.cfg')
+ envfile = os.path.join(HOME_PATH, 'global.cfg')
envparser = env_parser.Envparser(envfile)
iso_file = envparser.get_value("guest", guestos + '_' + guestarch)
diff --git a/repos/regression/multiple_thread_block_on_domain_create.py
b/repos/regression/multiple_thread_block_on_domain_create.py
index 1c85706..180736a 100644
--- a/repos/regression/multiple_thread_block_on_domain_create.py
+++ b/repos/regression/multiple_thread_block_on_domain_create.py
@@ -116,7 +116,7 @@ def multiple_thread_block_on_domain_create(params):
logger.info("the type of hypervisor is %s" % hypervisor)
logger.debug("the uri to connect is %s" % uri)
- envfile = os.path.join(homepath, 'env.cfg')
+ envfile = os.path.join(homepath, 'global.cfg')
envparser = env_parser.Envpaser(envfile)
ostree = envparser.get_value("guest", guestos + "_" + arch)
ks = envparser.get_value("guest", guestos + "_" + arch +
diff --git a/src/env_parser.py b/src/env_parser.py
index 0d2f2a2..cf4168f 100644
--- a/src/env_parser.py
+++ b/src/env_parser.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# env_parser.py: Parser for environment config (env.cfg).
+# env_parser.py: Parser for environment config (global.cfg).
#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
diff --git a/src/exception.py b/src/exception.py
index 7f67602..9b61bac 100644
--- a/src/exception.py
+++ b/src/exception.py
@@ -73,7 +73,7 @@ class CaseConfigfileError(LibvirtException):
class MissingVariable(LibvirtException):
code = 210
- message = "Variables missing from env.cfg [variables] section"
+ message = "Variables missing from global.cfg [variables] section"
class TestError(LibvirtException):
code = 211
diff --git a/src/generator.py b/src/generator.py
index 1f19ea3..4247fda 100644
--- a/src/generator.py
+++ b/src/generator.py
@@ -59,7 +59,7 @@ class FuncGen(object):
# Save case information to a file in a format
self.__case_info_save(activity, testrunid)
- self.env = env_parser.Envparser("env.cfg")
+ self.env = env_parser.Envparser("global.cfg")
mapper_obj = mapper.Mapper(activity)
case_list = mapper_obj.module_casename_func_map()
diff --git a/src/parser.py b/src/parser.py
index 1c4abcb..8a861fd 100644
--- a/src/parser.py
+++ b/src/parser.py
@@ -35,7 +35,7 @@ class CaseFileParser(object):
self.missing_variables = []
self.debug = debug
self.casefile = casefile
- self.env = env_parser.Envparser("env.cfg")
+ self.env = env_parser.Envparser("global.cfg")
self.loop_finish = False
self.loop_start = 0
self.loop_end = 0
@@ -210,7 +210,7 @@ class CaseFileParser(object):
tripped_valuelist = self.variables_lookup(tripped_valuelist)
if len(self.missing_variables) != 0:
raise exception.MissingVariable(
- "The variables %s referenced in %s could not be found in
env.cfg" %
+ "The variables %s referenced in %s could not be found in
global.cfg" %
(self.missing_variables, self.casefile))
tripped_valuename = tripped_valuelist[0]
--
1.7.7.3
5:39 a.m.
New subject: [libvirt] [test-API 14/14] Rename 'env.cfg' as 'global.cfg'
On 04/19/2012 10:25 AM, Osier Yang wrote:
It's not only about environment actually, many default settings
are
defined in it.
---
env.cfg => global.cfg | 0
repos/domain/install_image.py | 2 +-
repos/domain/install_linux_cdrom.py | 2 +-
repos/domain/install_linux_check.py | 2 +-
repos/domain/install_linux_net.py | 4 ++--
repos/domain/install_windows_cdrom.py | 6 +++---
.../multiple_thread_block_on_domain_create.py | 2 +-
src/env_parser.py | 2 +-
src/exception.py | 2 +-
src/generator.py | 2 +-
src/parser.py | 4 ++--
11 files changed, 14 insertions(+), 14 deletions(-)
rename env.cfg => global.cfg (100%)
diff --git a/env.cfg b/global.cfg
similarity index 100%
rename from env.cfg
rename to global.cfg
diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py
index be36b03..e94ebc7 100644
--- a/repos/domain/install_image.py
+++ b/repos/domain/install_image.py
@@ -60,7 +60,7 @@ def install_image(params):
logger.info("the path of directory of disk images located on is %s" %
imgfullpath)
- envfile = os.path.join(HOME_PATH, 'env.cfg')
+ envfile = os.path.join(HOME_PATH, 'global.cfg')
logger.info("the environment file is %s" % envfile)
envparser = env_parser.Envparser(envfile)
diff --git a/repos/domain/install_linux_cdrom.py b/repos/domain/install_linux_cdrom.py
index ee3c397..1d5fb28 100644
--- a/repos/domain/install_linux_cdrom.py
+++ b/repos/domain/install_linux_cdrom.py
@@ -223,7 +223,7 @@ def install_linux_cdrom(params):
logger.info("creating disk images file is successful.")
logger.info("get system environment information")
- envfile = os.path.join(HOME_PATH, 'env.cfg')
+ envfile = os.path.join(HOME_PATH, 'global.cfg')
logger.info("the environment file is %s" % envfile)
envparser = env_parser.Envparser(envfile)
diff --git a/repos/domain/install_linux_check.py b/repos/domain/install_linux_check.py
index 303ab7f..74b8819 100644
--- a/repos/domain/install_linux_check.py
+++ b/repos/domain/install_linux_check.py
@@ -148,7 +148,7 @@ def install_linux_check(params):
# Check app works fine in guest, such as: wget
logger.info("check point5: check app works fine in guest, such as:
wget")
logger.info("get system environment information")
- envfile = os.path.join(HOME_PATH, 'env.cfg')
+ envfile = os.path.join(HOME_PATH, 'global.cfg')
logger.info("the environment file is %s" % envfile)
envparser = env_parser.Envparser(envfile)
diff --git a/repos/domain/install_linux_net.py b/repos/domain/install_linux_net.py
index 105c0ea..a47bcea 100644
--- a/repos/domain/install_linux_net.py
+++ b/repos/domain/install_linux_net.py
@@ -188,13 +188,13 @@ def install_linux_net(params):
logger.info("get system environment information")
- envfile = os.path.join(HOME_PATH, 'env.cfg')
+ envfile = os.path.join(HOME_PATH, 'global.cfg')
logger.info("the environment file is %s" % envfile)
envparser = env_parser.Envparser(envfile)
# Get http, ftp or nfs url based on guest os, arch
- # and installation method from env.cfg
+ # and installation method from global.cfg
if installmethod == 'http':
ks = envparser.get_value("guest", guestos + "_" + guestarch
+
diff --git a/repos/domain/install_windows_cdrom.py
b/repos/domain/install_windows_cdrom.py
index 825aa29..402fa25 100644
--- a/repos/domain/install_windows_cdrom.py
+++ b/repos/domain/install_windows_cdrom.py
@@ -256,10 +256,10 @@ def install_windows_cdrom(params):
logger.info("creating disk images file is successful.")
logger.info("get system environment information")
- envfile = os.path.join(HOME_PATH, 'env.cfg')
+ envfile = os.path.join(HOME_PATH, 'global.cfg')
logger.info("the environment file is %s" % envfile)
- # Get iso file based on guest os and arch from env.cfg
+ # Get iso file based on guest os and arch from global.cfg
envparser = env_parser.Envparser(envfile)
iso_file = envparser.get_value("guest", guestos + '_' +
guestarch)
cdkey = envparser.get_value("guest", "%s_%s_key" % (guestos,
guestarch))
@@ -427,7 +427,7 @@ def install_windows_cdrom_clean(params):
guestos = params.get('guestos')
guestarch = params.get('guestarch')
- envfile = os.path.join(HOME_PATH, 'env.cfg')
+ envfile = os.path.join(HOME_PATH, 'global.cfg')
envparser = env_parser.Envparser(envfile)
iso_file = envparser.get_value("guest", guestos + '_' +
guestarch)
diff --git a/repos/regression/multiple_thread_block_on_domain_create.py
b/repos/regression/multiple_thread_block_on_domain_create.py
index 1c85706..180736a 100644
--- a/repos/regression/multiple_thread_block_on_domain_create.py
+++ b/repos/regression/multiple_thread_block_on_domain_create.py
@@ -116,7 +116,7 @@ def multiple_thread_block_on_domain_create(params):
logger.info("the type of hypervisor is %s" % hypervisor)
logger.debug("the uri to connect is %s" % uri)
- envfile = os.path.join(homepath, 'env.cfg')
+ envfile = os.path.join(homepath, 'global.cfg')
envparser = env_parser.Envpaser(envfile)
ostree = envparser.get_value("guest", guestos + "_" + arch)
ks = envparser.get_value("guest", guestos + "_" + arch +
diff --git a/src/env_parser.py b/src/env_parser.py
index 0d2f2a2..cf4168f 100644
--- a/src/env_parser.py
+++ b/src/env_parser.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# env_parser.py: Parser for environment config (env.cfg).
+# env_parser.py: Parser for environment config (global.cfg).
#
# Copyright (C) 2010-2012 Red Hat, Inc.
#
diff --git a/src/exception.py b/src/exception.py
index 7f67602..9b61bac 100644
--- a/src/exception.py
+++ b/src/exception.py
@@ -73,7 +73,7 @@ class CaseConfigfileError(LibvirtException):
class MissingVariable(LibvirtException):
code = 210
- message = "Variables missing from env.cfg [variables] section"
+ message = "Variables missing from global.cfg [variables] section"
class TestError(LibvirtException):
code = 211
diff --git a/src/generator.py b/src/generator.py
index 1f19ea3..4247fda 100644
--- a/src/generator.py
+++ b/src/generator.py
@@ -59,7 +59,7 @@ class FuncGen(object):
# Save case information to a file in a format
self.__case_info_save(activity, testrunid)
- self.env = env_parser.Envparser("env.cfg")
+ self.env = env_parser.Envparser("global.cfg")
mapper_obj = mapper.Mapper(activity)
case_list = mapper_obj.module_casename_func_map()
diff --git a/src/parser.py b/src/parser.py
index 1c4abcb..8a861fd 100644
--- a/src/parser.py
+++ b/src/parser.py
@@ -35,7 +35,7 @@ class CaseFileParser(object):
self.missing_variables = []
self.debug = debug
self.casefile = casefile
- self.env = env_parser.Envparser("env.cfg")
+ self.env = env_parser.Envparser("global.cfg")
self.loop_finish = False
self.loop_start = 0
self.loop_end = 0
@@ -210,7 +210,7 @@ class CaseFileParser(object):
tripped_valuelist = self.variables_lookup(tripped_valuelist)
if len(self.missing_variables) != 0:
raise exception.MissingVariable(
- "The variables %s referenced in %s could not be found in
env.cfg" %
+ "The variables %s referenced in %s could not be found in
global.cfg" %
(self.missing_variables, self.casefile))
tripped_valuename = tripped_valuelist[0]
global.ini isn't better
too many .cfg I am dizzied.
10:01 p.m.
On 2012年04月19日 10:25, Osier Yang wrote:
The TODO in round 2 is still not done, but let's get these
cleanups reviewed first.
Osier Yang (14):
Change libvirt-test-api to be executable
Remove NEWS and TODO
Destroy utils/check.py and move the functions into utils/utils.py
Move directory dist to src
Move utils/env_parser.py into src
Improve the comments telling what the scripts does for utils/*.py
Improve more comments to tell what the program does
Remove trainling blank lines for utils/*.sh
Use bash as the interpreter explicitly
Substitute 'guesttype' with 'virt_type'
Update AUTHORS
Rename utils/*.py with consistent naming style
Rename src/logxmlparser.py as src/log_generator.py
Rename 'env.cfg' as 'global.cfg'
Pushed the set, except 9/14. Though I don't quite agree with the
NACK, let's sort it out later.
Osier
4633
days inactive
4634
days old
30 comments
3 participants
participants (3)
-
Guannan Ren -
Martin Kletzander -
Osier Yang