[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