[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [test-API 08/17] Substitute 'guest ' with 'domain '



---
 cases/migration/ssh_persistent_paused_no_dst.conf  |    2 +-
 .../migration/ssh_persistent_paused_with_dst.conf  |    2 +-
 cases/migration/ssh_persistent_running_no_dst.conf |    2 +-
 .../migration/ssh_persistent_running_with_dst.conf |    2 +-
 cases/migration/ssh_transient_paused_no_dst.conf   |    2 +-
 cases/migration/ssh_transient_paused_with_dst.conf |    2 +-
 cases/migration/ssh_transient_running_no_dst.conf  |    2 +-
 .../migration/ssh_transient_running_with_dst.conf  |    2 +-
 cases/migration/tcp_persistent_paused_no_dst.conf  |    2 +-
 .../migration/tcp_persistent_paused_with_dst.conf  |    2 +-
 cases/migration/tcp_persistent_running_no_dst.conf |    2 +-
 .../migration/tcp_persistent_running_with_dst.conf |    2 +-
 .../tcp_sasl_persistent_paused_no_dst.conf         |    2 +-
 .../tcp_sasl_persistent_paused_with_dst.conf       |    2 +-
 .../tcp_sasl_persistent_running_no_dst.conf        |    2 +-
 .../tcp_sasl_persistent_running_with_dst.conf      |    2 +-
 .../tcp_sasl_transient_paused_no_dst.conf          |    2 +-
 .../tcp_sasl_transient_paused_with_dst.conf        |    2 +-
 .../tcp_sasl_transient_running_no_dst.conf         |    2 +-
 .../tcp_sasl_transient_running_with_dst.conf       |    2 +-
 cases/migration/tcp_transient_paused_no_dst.conf   |    2 +-
 cases/migration/tcp_transient_paused_with_dst.conf |    2 +-
 cases/migration/tcp_transient_running_no_dst.conf  |    2 +-
 .../migration/tcp_transient_running_with_dst.conf  |    2 +-
 cases/migration/tls_persistent_paused_no_dst.conf  |    2 +-
 .../migration/tls_persistent_paused_with_dst.conf  |    2 +-
 cases/migration/tls_persistent_running_no_dst.conf |    2 +-
 .../migration/tls_persistent_running_with_dst.conf |    2 +-
 .../tls_sasl_persistent_paused_no_dst.conf         |    2 +-
 .../tls_sasl_persistent_paused_with_dst.conf       |    2 +-
 .../tls_sasl_persistent_running_no_dst.conf        |    2 +-
 .../tls_sasl_persistent_running_with_dst.conf      |    2 +-
 .../tls_sasl_transient_paused_no_dst.conf          |    2 +-
 .../tls_sasl_transient_paused_with_dst.conf        |    2 +-
 .../tls_sasl_transient_running_no_dst.conf         |    2 +-
 .../tls_sasl_transient_running_with_dst.conf       |    2 +-
 cases/migration/tls_transient_paused_no_dst.conf   |    2 +-
 cases/migration/tls_transient_paused_with_dst.conf |    2 +-
 cases/migration/tls_transient_running_no_dst.conf  |    2 +-
 .../migration/tls_transient_running_with_dst.conf  |    2 +-
 .../en-US/Understanding_libvirt-test-API.xml       |    2 +-
 .../en-US/Writing_a_test_case.xml                  |   14 +++---
 .../libvirt-test-API_Guide/en-US/extras/log.txt    |    8 ++--
 global.cfg                                         |   14 +++---
 repos/domain/attach_disk.py                        |    4 +-
 repos/domain/attach_interface.py                   |    4 +-
 repos/domain/autostart.py                          |    2 +-
 repos/domain/balloon_memory.py                     |   42 +++++++-------
 repos/domain/blkstats.py                           |    2 +-
 repos/domain/console_io.py                         |    4 +-
 repos/domain/console_mutex.py                      |    2 +-
 repos/domain/cpu_affinity.py                       |   22 ++++----
 repos/domain/cpu_topology.py                       |   14 +++---
 repos/domain/create.py                             |    4 +-
 repos/domain/define.py                             |    2 +-
 repos/domain/destroy.py                            |    6 +-
 repos/domain/detach_disk.py                        |    4 +-
 repos/domain/detach_interface.py                   |    4 +-
 repos/domain/domain_blkinfo.py                     |    2 +-
 repos/domain/domain_id.py                          |    2 +-
 repos/domain/domain_list.py                        |   10 ++--
 repos/domain/domain_name.py                        |    4 +-
 repos/domain/domain_uuid.py                        |    4 +-
 repos/domain/domblkinfo.py                         |    2 +-
 repos/domain/dump.py                               |   14 +++---
 repos/domain/eventhandler.py                       |    6 +-
 repos/domain/ifstats.py                            |    2 +-
 repos/domain/install_image.py                      |   14 +++---
 repos/domain/install_linux_cdrom.py                |   58 ++++++++++----------
 repos/domain/install_linux_check.py                |   36 ++++++------
 repos/domain/install_linux_net.py                  |   52 +++++++++---------
 repos/domain/install_windows_cdrom.py              |   50 +++++++++---------
 repos/domain/migrate.py                            |    2 +-
 repos/domain/restore.py                            |   16 +++---
 repos/domain/save.py                               |   16 +++---
 repos/domain/sched_params.py                       |    2 +-
 repos/domain/shutdown.py                           |    4 +-
 repos/domain/start.py                              |    4 +-
 repos/domain/suspend.py                            |    2 +-
 repos/libvirtd/restart.py                          |    4 +-
 .../multiple_thread_block_on_domain_create.py      |   14 +++---
 repos/sVirt/domain_nfs_start.py                    |    6 +-
 repos/snapshot/delete.py                           |    2 +-
 repos/snapshot/file_flag.py                        |   12 ++--
 repos/snapshot/flag_check.py                       |    6 +-
 repos/snapshot/internal_create.py                  |    2 +-
 repos/snapshot/revert.py                           |    2 +-
 repos/snapshot/snapshot_list.py                    |    4 +-
 88 files changed, 294 insertions(+), 294 deletions(-)

diff --git a/cases/migration/ssh_persistent_paused_no_dst.conf b/cases/migration/ssh_persistent_paused_no_dst.conf
index e236d55..542b465 100644
--- a/cases/migration/ssh_persistent_paused_no_dst.conf
+++ b/cases/migration/ssh_persistent_paused_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/ssh_persistent_paused_with_dst.conf b/cases/migration/ssh_persistent_paused_with_dst.conf
index 8538d64..058379e 100644
--- a/cases/migration/ssh_persistent_paused_with_dst.conf
+++ b/cases/migration/ssh_persistent_paused_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/ssh_persistent_running_no_dst.conf b/cases/migration/ssh_persistent_running_no_dst.conf
index 455c16a..dc06b8f 100644
--- a/cases/migration/ssh_persistent_running_no_dst.conf
+++ b/cases/migration/ssh_persistent_running_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/ssh_persistent_running_with_dst.conf b/cases/migration/ssh_persistent_running_with_dst.conf
index 54f34a0..7e1bd89 100644
--- a/cases/migration/ssh_persistent_running_with_dst.conf
+++ b/cases/migration/ssh_persistent_running_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/ssh_transient_paused_no_dst.conf b/cases/migration/ssh_transient_paused_no_dst.conf
index d92f9f0..a3fdbf4 100644
--- a/cases/migration/ssh_transient_paused_no_dst.conf
+++ b/cases/migration/ssh_transient_paused_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/ssh_transient_paused_with_dst.conf b/cases/migration/ssh_transient_paused_with_dst.conf
index 4119522..3cb89b4 100644
--- a/cases/migration/ssh_transient_paused_with_dst.conf
+++ b/cases/migration/ssh_transient_paused_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/ssh_transient_running_no_dst.conf b/cases/migration/ssh_transient_running_no_dst.conf
index 6556ac7..570033e 100644
--- a/cases/migration/ssh_transient_running_no_dst.conf
+++ b/cases/migration/ssh_transient_running_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/ssh_transient_running_with_dst.conf b/cases/migration/ssh_transient_running_with_dst.conf
index edeac12..6dd45b5 100644
--- a/cases/migration/ssh_transient_running_with_dst.conf
+++ b/cases/migration/ssh_transient_running_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tcp_persistent_paused_no_dst.conf b/cases/migration/tcp_persistent_paused_no_dst.conf
index 19c9857..53fa442 100644
--- a/cases/migration/tcp_persistent_paused_no_dst.conf
+++ b/cases/migration/tcp_persistent_paused_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tcp_persistent_paused_with_dst.conf b/cases/migration/tcp_persistent_paused_with_dst.conf
index 9d978d6..11e4ea0 100644
--- a/cases/migration/tcp_persistent_paused_with_dst.conf
+++ b/cases/migration/tcp_persistent_paused_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tcp_persistent_running_no_dst.conf b/cases/migration/tcp_persistent_running_no_dst.conf
index bea8ef6..552b8a3 100644
--- a/cases/migration/tcp_persistent_running_no_dst.conf
+++ b/cases/migration/tcp_persistent_running_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tcp_persistent_running_with_dst.conf b/cases/migration/tcp_persistent_running_with_dst.conf
index 236377f..8c8770c 100644
--- a/cases/migration/tcp_persistent_running_with_dst.conf
+++ b/cases/migration/tcp_persistent_running_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tcp_sasl_persistent_paused_no_dst.conf b/cases/migration/tcp_sasl_persistent_paused_no_dst.conf
index c4fe3ee..f8f8b41 100644
--- a/cases/migration/tcp_sasl_persistent_paused_no_dst.conf
+++ b/cases/migration/tcp_sasl_persistent_paused_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tcp_sasl_persistent_paused_with_dst.conf b/cases/migration/tcp_sasl_persistent_paused_with_dst.conf
index 0b785a7..711fa91 100644
--- a/cases/migration/tcp_sasl_persistent_paused_with_dst.conf
+++ b/cases/migration/tcp_sasl_persistent_paused_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tcp_sasl_persistent_running_no_dst.conf b/cases/migration/tcp_sasl_persistent_running_no_dst.conf
index ff10eeb..cb1b4d3 100644
--- a/cases/migration/tcp_sasl_persistent_running_no_dst.conf
+++ b/cases/migration/tcp_sasl_persistent_running_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tcp_sasl_persistent_running_with_dst.conf b/cases/migration/tcp_sasl_persistent_running_with_dst.conf
index f5629ae..90dec94 100644
--- a/cases/migration/tcp_sasl_persistent_running_with_dst.conf
+++ b/cases/migration/tcp_sasl_persistent_running_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tcp_sasl_transient_paused_no_dst.conf b/cases/migration/tcp_sasl_transient_paused_no_dst.conf
index cc31768..d5b7764 100644
--- a/cases/migration/tcp_sasl_transient_paused_no_dst.conf
+++ b/cases/migration/tcp_sasl_transient_paused_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tcp_sasl_transient_paused_with_dst.conf b/cases/migration/tcp_sasl_transient_paused_with_dst.conf
index 933578c..6b8195a 100644
--- a/cases/migration/tcp_sasl_transient_paused_with_dst.conf
+++ b/cases/migration/tcp_sasl_transient_paused_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tcp_sasl_transient_running_no_dst.conf b/cases/migration/tcp_sasl_transient_running_no_dst.conf
index 3c73997..347a6b8 100644
--- a/cases/migration/tcp_sasl_transient_running_no_dst.conf
+++ b/cases/migration/tcp_sasl_transient_running_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tcp_sasl_transient_running_with_dst.conf b/cases/migration/tcp_sasl_transient_running_with_dst.conf
index fea96ff..35575e1 100644
--- a/cases/migration/tcp_sasl_transient_running_with_dst.conf
+++ b/cases/migration/tcp_sasl_transient_running_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tcp_transient_paused_no_dst.conf b/cases/migration/tcp_transient_paused_no_dst.conf
index 494bf2b..69d502e 100644
--- a/cases/migration/tcp_transient_paused_no_dst.conf
+++ b/cases/migration/tcp_transient_paused_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tcp_transient_paused_with_dst.conf b/cases/migration/tcp_transient_paused_with_dst.conf
index 15b3607..df93e5b 100644
--- a/cases/migration/tcp_transient_paused_with_dst.conf
+++ b/cases/migration/tcp_transient_paused_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tcp_transient_running_no_dst.conf b/cases/migration/tcp_transient_running_no_dst.conf
index 246e5e4..97cf6b0 100644
--- a/cases/migration/tcp_transient_running_no_dst.conf
+++ b/cases/migration/tcp_transient_running_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tcp_transient_running_with_dst.conf b/cases/migration/tcp_transient_running_with_dst.conf
index b20b1fe..4d9ba03 100644
--- a/cases/migration/tcp_transient_running_with_dst.conf
+++ b/cases/migration/tcp_transient_running_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tls_persistent_paused_no_dst.conf b/cases/migration/tls_persistent_paused_no_dst.conf
index 43b9147..6ff366b 100644
--- a/cases/migration/tls_persistent_paused_no_dst.conf
+++ b/cases/migration/tls_persistent_paused_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tls_persistent_paused_with_dst.conf b/cases/migration/tls_persistent_paused_with_dst.conf
index f6faa74..1f86546 100644
--- a/cases/migration/tls_persistent_paused_with_dst.conf
+++ b/cases/migration/tls_persistent_paused_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tls_persistent_running_no_dst.conf b/cases/migration/tls_persistent_running_no_dst.conf
index 708f406..f72b3d4 100644
--- a/cases/migration/tls_persistent_running_no_dst.conf
+++ b/cases/migration/tls_persistent_running_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tls_persistent_running_with_dst.conf b/cases/migration/tls_persistent_running_with_dst.conf
index 05b0170..cd6589f 100644
--- a/cases/migration/tls_persistent_running_with_dst.conf
+++ b/cases/migration/tls_persistent_running_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tls_sasl_persistent_paused_no_dst.conf b/cases/migration/tls_sasl_persistent_paused_no_dst.conf
index 96a4187..5e33a60 100644
--- a/cases/migration/tls_sasl_persistent_paused_no_dst.conf
+++ b/cases/migration/tls_sasl_persistent_paused_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tls_sasl_persistent_paused_with_dst.conf b/cases/migration/tls_sasl_persistent_paused_with_dst.conf
index 5d9f13a..196789a 100644
--- a/cases/migration/tls_sasl_persistent_paused_with_dst.conf
+++ b/cases/migration/tls_sasl_persistent_paused_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tls_sasl_persistent_running_no_dst.conf b/cases/migration/tls_sasl_persistent_running_no_dst.conf
index 6a1f844..5086ec4 100644
--- a/cases/migration/tls_sasl_persistent_running_no_dst.conf
+++ b/cases/migration/tls_sasl_persistent_running_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tls_sasl_persistent_running_with_dst.conf b/cases/migration/tls_sasl_persistent_running_with_dst.conf
index 3cc7493..cf1c5dc 100644
--- a/cases/migration/tls_sasl_persistent_running_with_dst.conf
+++ b/cases/migration/tls_sasl_persistent_running_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tls_sasl_transient_paused_no_dst.conf b/cases/migration/tls_sasl_transient_paused_no_dst.conf
index e080d07..a93efed 100644
--- a/cases/migration/tls_sasl_transient_paused_no_dst.conf
+++ b/cases/migration/tls_sasl_transient_paused_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tls_sasl_transient_paused_with_dst.conf b/cases/migration/tls_sasl_transient_paused_with_dst.conf
index 7a8c66f..25f455b 100644
--- a/cases/migration/tls_sasl_transient_paused_with_dst.conf
+++ b/cases/migration/tls_sasl_transient_paused_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tls_sasl_transient_running_no_dst.conf b/cases/migration/tls_sasl_transient_running_no_dst.conf
index df9c03a..d67383d 100644
--- a/cases/migration/tls_sasl_transient_running_no_dst.conf
+++ b/cases/migration/tls_sasl_transient_running_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tls_sasl_transient_running_with_dst.conf b/cases/migration/tls_sasl_transient_running_with_dst.conf
index a8c70c7..db68b92 100644
--- a/cases/migration/tls_sasl_transient_running_with_dst.conf
+++ b/cases/migration/tls_sasl_transient_running_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tls_transient_paused_no_dst.conf b/cases/migration/tls_transient_paused_no_dst.conf
index b033f92..d6d3b60 100644
--- a/cases/migration/tls_transient_paused_no_dst.conf
+++ b/cases/migration/tls_transient_paused_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tls_transient_paused_with_dst.conf b/cases/migration/tls_transient_paused_with_dst.conf
index 45e2c04..9052a9c 100644
--- a/cases/migration/tls_transient_paused_with_dst.conf
+++ b/cases/migration/tls_transient_paused_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tls_transient_running_no_dst.conf b/cases/migration/tls_transient_running_no_dst.conf
index ac84c04..dfaff02 100644
--- a/cases/migration/tls_transient_running_no_dst.conf
+++ b/cases/migration/tls_transient_running_no_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/cases/migration/tls_transient_running_with_dst.conf b/cases/migration/tls_transient_running_with_dst.conf
index c628f21..f789d55 100644
--- a/cases/migration/tls_transient_running_with_dst.conf
+++ b/cases/migration/tls_transient_running_with_dst.conf
@@ -1,4 +1,4 @@
-# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 guest image file
+# This is a sample for migration testing, it assumes that there is a preinstalled rhel6 domain image file
 # named rhel6 located in shared storage. Then on both host side, it needs to mount the shared folder onto
 # the default libvirt image folder: /var/lib/libvirt/images
 
diff --git a/docs/User_Guide/libvirt-test-API_Guide/en-US/Understanding_libvirt-test-API.xml b/docs/User_Guide/libvirt-test-API_Guide/en-US/Understanding_libvirt-test-API.xml
index a563953..b065cb1 100644
--- a/docs/User_Guide/libvirt-test-API_Guide/en-US/Understanding_libvirt-test-API.xml
+++ b/docs/User_Guide/libvirt-test-API_Guide/en-US/Understanding_libvirt-test-API.xml
@@ -203,7 +203,7 @@ repos
           <para><filename>xml_builder.py</filename> builds a virtual machine from an XML file.</para>
         </listitem>
         <listitem>
-          <para>Random MAC address generator. Useful when installing a guest machine.</para>
+          <para>Random MAC address generator. Useful when installing a domain machine.</para>
         </listitem>
         <listitem>
           <para><filename>global_parser.py</filename> is the parser component of the environment INI file.</para>
diff --git a/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml b/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml
index 64eb308..dec8bd7 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
@@ -75,7 +75,7 @@ def install_domain(dict):
         <para>Create a new NFS based storage pool and create a volume.</para>
       </listitem>
       <listitem>
-        <para>Install a new rhel5u4 guest machine on the volume with multiprocess disabled and repeat the test once.</para>
+        <para>Install a new rhel5u4 domain machine on the volume with multiprocess disabled and repeat the test once.</para>
       </listitem>
     </orderedlist>
     <para>To achieve the test objective, two test cases are required:</para>
@@ -85,7 +85,7 @@ def install_domain(dict):
         <para>The storage test case is called 'initialize_storage' and is located in <filename>/repos/storage/initialize_storage.py</filename></para>
       </listitem>
       <listitem>
-        <para>Install the guest on the volume.</para>
+        <para>Install the domain on the volume.</para>
         <para>The install test case is called 'domain_install' and is located in <filename>/repos/domain/install_domain.py</filename></para>
       </listitem>
     </orderedlist>
@@ -180,7 +180,7 @@ def initialize_storage(dict):
     </example>
 
     <example>
-      <title>Install guest test case <filename>/repos/domain/install_domain.py</filename></title>
+      <title>Install domain test case <filename>/repos/domain/install_domain.py</filename></title>
 <programlisting>
 #!/usr/bin/env python
 
@@ -248,18 +248,18 @@ def install_domain(dict):
 
     xmlobj = xml_builder.XmlBuilder()
     guestinstxml = xmlobj.build_domain_install(dict)
-    logger.debug('dump installation guest xml:\n%s' %guestinstxml)
+    logger.debug('dump installation domain xml:\n%s' %guestinstxml)
 
     conn = connectAPI.ConnectAPI.open("xen:///")
     domobj = domainAPI.DomainAPI(conn)
-    logger.info('define guest from xml description')
+    logger.info('define domain from xml description')
     domobj.define_domain(guestinstxml)
 
-    logger.info('start installation guest ...')
+    logger.info('start installation domain ...')
     domobj.start_domain(gname)
 
     state = domobj.get_domain_state(gname)
-    logger.debug('current guest state: %s' %state)
+    logger.debug('current domain state: %s' %state)
 </programlisting>
     </example>
 
diff --git a/docs/User_Guide/libvirt-test-API_Guide/en-US/extras/log.txt b/docs/User_Guide/libvirt-test-API_Guide/en-US/extras/log.txt
index 210e57c..200c5f4 100644
--- a/docs/User_Guide/libvirt-test-API_Guide/en-US/extras/log.txt
+++ b/docs/User_Guide/libvirt-test-API_Guide/en-US/extras/log.txt
@@ -23,9 +23,9 @@
 [2009-09-18 15:38:50] 5141 DEBUG    (install_domain:60) kisckstart file: 
     http://10.00.00.01/ks-rhel-5.4-x86_64-noxen-smp-minimal.cfg 
 [2009-09-18 15:38:50] 5141 INFO     (install_domain:62) prepare installation booting cdrom 
-[2009-09-18 15:39:01] 5141 DEBUG    (install_domain:67) dump installation guest xml: 
+[2009-09-18 15:39:01] 5141 DEBUG    (install_domain:67) dump installation domain xml: 
 <?xml version="1.0" ?> 
 <domain type="xen"><name>rhel5u4</name><memory>1048576</memory><vcpu>1</vcpu><os><type>hvm</type><loader>/usr/lib/xen/boot/hvmloader</loader><boot dev="cdrom"/></os><features><acpi/><apic/><pae/></features><clock offset="utc"/><on_poweroff>destroy</on_poweroff><on_reboot>restart</on_reboot><on_crash>restart</on_crash><devices><emulator>/usr/lib64/xen/bin/qemu-dm</emulator><disk device="disk" type="file"><driver name="file"/><source file="/var/lib/xen/images/rhel5u4.img"/><target bus="ide" dev="hda"/></disk><disk device="cdrom" type="file"><driver name="file"/><source file="/tmp/rhel5u4/custom.iso"/><target bus="ide" dev="hdc"/><readonly/></disk><interface type="bridge"><source bridge="xenbr0"/><script path="vif-bridge"/></interface><console/><input bus="ps2" type="mouse"/><graphics keymap="en-us" port="-1" type="vnc"/></devices></domain> 
-[2009-09-18 15:39:01] 5141 INFO     (install_domain:71) define guest from xml description 
-[2009-09-18 15:39:01] 5141 INFO     (install_domain:74) start installation guest ... 
-[2009-09-18 15:39:02] 5141 DEBUG    (install_domain:78) current guest state: running 
+[2009-09-18 15:39:01] 5141 INFO     (install_domain:71) define domain from xml description 
+[2009-09-18 15:39:01] 5141 INFO     (install_domain:74) start installation domain ... 
+[2009-09-18 15:39:02] 5141 DEBUG    (install_domain:78) current domain state: running 
diff --git a/global.cfg b/global.cfg
index 6cfdcac..825e14a 100644
--- a/global.cfg
+++ b/global.cfg
@@ -4,7 +4,7 @@
 
 #
 # The image section give links to QCow2 preinstalled images to be used
-# for guest testing
+# for domain testing
 #
 [image]
 winxp_i386 = http://
@@ -17,8 +17,8 @@ win7_i386 = http://
 win7_x86_64 = http://
 
 #
-# The guest section provides informations on how to install
-# domain guest OS. This is used by guest installation testsing
+# The domain section provides informations on how to install
+# domain domain OS. This is used by domain installation testsing
 #
 # This includes:
 #  - URL to repositories like the top level directory in Fedora
@@ -26,8 +26,8 @@ win7_x86_64 = http://
 #    http://rpmfind.net/linux/fedora/releases/14/Fedora/x86_64/os/
 #  - kickstart URLs for Fedora or RHEL(like) guests
 # or
-#  - URL to iso installation images for Windows guest installations
-#  - installation keys for Windows guest installations
+#  - URL to iso installation images for Windows domain installations
+#  - installation keys for Windows domain installations
 #
 [guest]
 rhel3u9_i386 = http://
@@ -123,7 +123,7 @@ password =
 
 # default hypervisor used
 defaulthv = kvm
-# default guest name for defining or installing a new guest
+# default domain name for defining or installing a new guest
 defaultname = libvirt_test_api
 # default os version to use for installing a new guest
 # the value of it is the first part of 'rhel6u2_x86_64' in [guest] section above
@@ -140,7 +140,7 @@ defaulthd = virtio
 defaultnic = virtio
 # static uuid for define, create and installing a guest
 static_uuid = 05867c1a-afeb-300e-e55e-2673391ae080
-# path to a disk image containing a preinstalled guest for testing
+# path to a disk image containing a preinstalled domain for testing
 testfullimagepath = /var/lib/libvirt/images/f14.img
 
 ################################################################
diff --git a/repos/domain/attach_disk.py b/repos/domain/attach_disk.py
index f07b5bb..26890ae 100644
--- a/repos/domain/attach_disk.py
+++ b/repos/domain/attach_disk.py
@@ -33,7 +33,7 @@ def create_image(name, size, logger):
         return False
 
 def check_domain_status(domobj):
-    """Check guest current status"""
+    """Check domain current status"""
     state = domobj.info()[0]
     if state == libvirt.VIR_DOMAIN_SHUTOFF or state == libvirt.VIR_DOMAIN_SHUTDOWN:
     # add check function
@@ -95,7 +95,7 @@ def attach_disk(params):
     except libvirtError, e:
         logger.error("API error message: %s, error code is %s" \
                      % (e.message, e.get_error_code()))
-        logger.error("attach %s disk to guest %s" % (imagename, guestname))
+        logger.error("attach %s disk to domain %s" % (imagename, guestname))
         return 1
 
     return 0
diff --git a/repos/domain/attach_interface.py b/repos/domain/attach_interface.py
index ce4282a..5868fcb 100644
--- a/repos/domain/attach_interface.py
+++ b/repos/domain/attach_interface.py
@@ -16,7 +16,7 @@ required_params = ('guestname', 'ifacetype', 'source',)
 optional_params = ('hdmodel',)
 
 def check_domain_status(guestname, domobj):
-    """Check guest current status"""
+    """Check domain current status"""
     state = domobj.get_state(guestname)
     if state == "shutoff" or state == "shutdown":
     # add check function
@@ -60,7 +60,7 @@ def attach_interface(params):
     except libvirtError, e:
         logger.error("API error message: %s, error code is %s" \
                      % (e.message, e.get_error_code()))
-        logger.error("attach a interface to guest %s" % guestname)
+        logger.error("attach a interface to domain %s" % guestname)
         return 1
 
     return 0
diff --git a/repos/domain/autostart.py b/repos/domain/autostart.py
index 0b11022..7c3d498 100644
--- a/repos/domain/autostart.py
+++ b/repos/domain/autostart.py
@@ -23,7 +23,7 @@ def check_domain_autostart(*args):
         domxml = "/etc/%s/auto/%s" % (hypervisor, guestname)
     else:
         domxml = "/etc/libvirt/%s/autostart/%s.xml" % (hypervisor, guestname)
-    logger.debug("guest xml file is: %s" %domxml)
+    logger.debug("domain xml file is: %s" %domxml)
 
     if flag == 1:
         if os.access(domxml, os.F_OK):
diff --git a/repos/domain/balloon_memory.py b/repos/domain/balloon_memory.py
index 11d4565..d48ea3b 100644
--- a/repos/domain/balloon_memory.py
+++ b/repos/domain/balloon_memory.py
@@ -19,7 +19,7 @@ required_params = ('guestname', 'memorypair',)
 optional_params = ()
 
 def get_mem_size(ip):
-    """ get current memory size in guest virtual machine"""
+    """ get current memory size in domain virtual machine"""
 
     username = 'root'
     password = 'redhat'
@@ -43,7 +43,7 @@ def redefine_memory_size(domobj, domname, memsize):
         then, define the domain again
     """
     domxml = domobj.XMLDesc(0)
-    logger.debug('''original guest %s xml :\n%s''' % (domname, domxml))
+    logger.debug('''original domain %s xml :\n%s''' % (domname, domxml))
 
     doc = minidom.parseString(domxml)
 
@@ -65,14 +65,14 @@ def redefine_memory_size(domobj, domname, memsize):
     return doc.toxml()
 
 def domain_power_on(domobj, domname, mac):
-    """ power on guest virtual machine"""
+    """ power on domain virtual machine"""
 
     try:
         domobj.create()
     except libvirtError, e:
         logger.error("API error message: %s, error code is %s" \
                      % (e.message, e.get_error_code()))
-        logger.error("fail to power on guest %" % domname)
+        logger.error("fail to power on domain %" % domname)
         return 1
 
     timeout = 600
@@ -97,22 +97,22 @@ def domain_power_on(domobj, domname, mac):
     return 0
 
 def domain_power_off(domobj, domname):
-    """ power off guest virtual machine"""
+    """ power off domain virtual machine"""
 
     state = domobj.info()[0]
-    logger.debug("current guest status: %s" %state)
+    logger.debug("current domain status: %s" %state)
     try:
         domobj.destroy()
     except libvirtError, e:
         logger.error("API error message: %s, error code is %s" \
                      % (e.message, e.get_error_code()))
-        logger.error("fail to power off guest %" % domname)
+        logger.error("fail to power off domain %" % domname)
         return 1
 
     time.sleep(1)
     state = domobj.info()[0]
     if state == libvirt.VIR_DOMAIN_SHUTOFF or state == libvirt.VIR_DOMAIN_SHUTDOWN:
-        logger.info("the guest is power off already.")
+        logger.info("the domain is power off already.")
     else:
         logger.error("failed to power off the domain %s" % domname)
         return 1
@@ -121,7 +121,7 @@ def domain_power_off(domobj, domname):
 
 
 def balloon_memory(params):
-    """testing balloon memory for guest virtual machine
+    """testing balloon memory for domain virtual machine
        Return 0 on SUCCESS or 1 on FAILURE
     """
     global logger
@@ -150,14 +150,14 @@ def balloon_memory(params):
 
     if domname not in Defined_dom_list and \
        domname not in Active_dom_list:
-        logger.error("guest %s doesn't exist" % domname)
+        logger.error("domain %s doesn't exist" % domname)
         return 1
     elif domname in Defined_dom_list:
-        logger.info("guest %s exists but not running , \
+        logger.info("domain %s exists but not running , \
                      we begin to set memory to maximum memory" % domname)
 
     elif domname in Active_dom_list:
-        logger.info("guest %s is running now, \
+        logger.info("domain %s is running now, \
                      power off it to set memory to maximum memory" %
                      domname)
         domobj = conn.lookupByName(domname)
@@ -167,7 +167,7 @@ def balloon_memory(params):
 
     # Redefine domain with specified memory size
     newdomxml = redefine_memory_size(domobj, domname, maxmem)
-    logger.debug('''new guest %s xml :\n%s''' %(domname, newdomxml))
+    logger.debug('''new domain %s xml :\n%s''' %(domname, newdomxml))
 
     logger.info("undefine the original guest")
     try:
@@ -175,19 +175,19 @@ def balloon_memory(params):
     except libvirtError, e:
         logger.error("API error message: %s, error code is %s" \
                      % (e.message, e.get_error_code()))
-        logger.error("fail to undefine guest %" % domname)
+        logger.error("fail to undefine domain %" % domname)
         return 1
 
-    logger.info("define guest with new xml")
+    logger.info("define domain with new xml")
     try:
         conn.defineXML(newdomxml)
     except libvirtError, e:
         logger.error("API error message: %s, error code is %s" \
                      % (e.message, e.get_error_code()))
-        logger.error("fail to define guest %s" % domname)
+        logger.error("fail to define domain %s" % domname)
         return 1
 
-    logger.info("memory set is finished, boot up the guest %s " % domname)
+    logger.info("memory set is finished, boot up the domain %s " % domname)
     ret = domain_power_on(domobj, domname, mac)
     if ret:
         return 1
@@ -198,7 +198,7 @@ def balloon_memory(params):
 
     logger.info("the current memory size is %s" % current_memory)
 
-    logger.info("Now, set the memory size of guest to the minimum value")
+    logger.info("Now, set the memory size of domain to the minimum value")
 
     try:
         domobj.setMemory(minmem)
@@ -208,7 +208,7 @@ def balloon_memory(params):
         logger.error("fail to set memory size")
         return 1
 
-    logger.debug("dump the xml description of guest virtual machine %s" %
+    logger.debug("dump the xml description of domain virtual machine %s" %
                   domname)
     dom_xml = domobj.XMLDesc(0)
     logger.debug("the xml definination is %s" % dom_xml)
@@ -229,7 +229,7 @@ def balloon_memory(params):
                      rounded to the value %s we expected" % minmem)
 
     logger.info("Now, we restore back the memory size of \
-                 guest to the maximum value")
+                 domain to the maximum value")
 
     try:
         domobj.setMemory(maxmem)
@@ -240,7 +240,7 @@ def balloon_memory(params):
         return 1
 
     logger.debug("dump the xml description of \
-                  guest virtual machine %s" % domname)
+                  domain virtual machine %s" % domname)
     dom_xml = domobj.XMLDesc(0)
     logger.debug("the xml definination is %s" % dom_xml)
 
diff --git a/repos/domain/blkstats.py b/repos/domain/blkstats.py
index 24c4b85..7b02ab9 100644
--- a/repos/domain/blkstats.py
+++ b/repos/domain/blkstats.py
@@ -15,7 +15,7 @@ required_params = ('guestname',)
 optional_params = ()
 
 def check_domain_status(domobj):
-    """Check guest current status"""
+    """Check domain current status"""
     state = domobj.info()[0]
     if state == libvirt.VIR_DOMAIN_SHUTOFF or state == libvirt.VIR_DOMAIN_SHUTDOWN:
     # add check function
diff --git a/repos/domain/console_io.py b/repos/domain/console_io.py
index 266b020..65f41ed 100644
--- a/repos/domain/console_io.py
+++ b/repos/domain/console_io.py
@@ -22,7 +22,7 @@ def alarm_handler(signum, frame):
 def console_io(params):
     """Attach to console"""
     logger = params['logger']
-    guest = params['guestname']
+    domain = params['guestname']
     device = params.get('device', 'serial0')
     infile = params.get('input', None)
     outfile = params.get('output', None)
@@ -92,7 +92,7 @@ def console_io(params):
                 if reply.startswith(expectstr):
                     logger.info("Recieved expected output from the host")
                 else:
-                    raise TestError("Reply from the guest doesn't match with expected reply")
+                    raise TestError("Reply from the domain doesn't match with expected reply")
 
     except libvirtError, e:
         logger.error("Libvirt call failed: " + str(e))
diff --git a/repos/domain/console_mutex.py b/repos/domain/console_mutex.py
index bc8cb68..f6cea85 100644
--- a/repos/domain/console_mutex.py
+++ b/repos/domain/console_mutex.py
@@ -13,7 +13,7 @@ optional_params = ('device',)
 def console_mutex(params):
     """Attach to console"""
     logger = params['logger']
-    guest = params['guestname']
+    domain = params['guestname']
     device = params.get('device', 'serial0')
 
     try:
diff --git a/repos/domain/cpu_affinity.py b/repos/domain/cpu_affinity.py
index 1b300dc..38ab5e3 100644
--- a/repos/domain/cpu_affinity.py
+++ b/repos/domain/cpu_affinity.py
@@ -23,7 +23,7 @@ def redefine_vcpu_number(domobj, domain_name, vcpu):
        then, define the domain again
     """
     domxml = domobj.XMLDesc(0)
-    logger.debug('''original guest %s xml :\n%s''' %(domain_name, domxml))
+    logger.debug('''original domain %s xml :\n%s''' %(domain_name, domxml))
 
     doc = minidom.parseString(domxml)
 
@@ -69,7 +69,7 @@ def set_vcpus(util, domobj, domain_name, vcpu):
         logger.info('ping guest')
 
         if utils.do_ping(ip, 30):
-            logger.error('The guest is still active, IP: ' + str(ip))
+            logger.error('The domain is still active, IP: ' + str(ip))
         else:
             logger.info("domain %s is destroied successfully" % domain_name)
             break
@@ -79,7 +79,7 @@ def set_vcpus(util, domobj, domain_name, vcpu):
         return 1
 
     newdomxml = redefine_vcpu_number(domobj, domain_name, vcpu)
-    logger.debug('''new guest %s xml :\n%s''' %(domain_name, newdomxml))
+    logger.debug('''new domain %s xml :\n%s''' %(domain_name, newdomxml))
 
     logger.info("undefine the original guest")
     try:
@@ -87,21 +87,21 @@ def set_vcpus(util, domobj, domain_name, vcpu):
     except libvirtError, e:
         logger.error("API error message: %s, error code is %s" \
                      % (e.message, e.get_error_code()))
-        logger.error("fail to undefine guest %" % domain_name)
+        logger.error("fail to undefine domain %" % domain_name)
         return 1
 
-    logger.info("define guest with new xml")
+    logger.info("define domain with new xml")
     try:
         conn = domobj._conn
         conn.defineXML(newdomxml)
     except libvirtError, e:
         logger.error("API error message: %s, error code is %s" \
                      % (e.message, e.get_error_code()))
-        logger.error("fail to define guest %s" % domain_name)
+        logger.error("fail to define domain %s" % domain_name)
         return 1
 
     try:
-        logger.info('boot guest up ...')
+        logger.info('boot domain up ...')
         domobj.create()
     except libvirtError, e:
         logger.error("API error message: %s, error code is %s" \
@@ -213,24 +213,24 @@ def cpu_affinity(params):
         domain_names.append(obj.name())
 
     if domain_name not in domain_names:
-        logger.error("guest %s doesn't exist or not be running." %
+        logger.error("domain %s doesn't exist or not be running." %
                       domain_name)
         return 1
 
     domobj = conn.lookupByName(domain_name)
 
     vcpunum = utils.get_num_vcpus(domain_name)
-    logger.info("the current vcpu number of guest %s is %s" % \
+    logger.info("the current vcpu number of domain %s is %s" % \
                 (domain_name, vcpunum))
 
     if vcpunum != vcpu:
-        logger.info("set the vcpu of the guest to %s" % vcpu)
+        logger.info("set the vcpu of the domain to %s" % vcpu)
         ret = set_vcpus(util, domobj, domain_name, vcpu)
         if ret != 0:
             return 1
 
     vcpunum_after_set = utils.get_num_vcpus(domain_name)
-    logger.info("after setting, the current vcpu number the guest is %s" % \
+    logger.info("after setting, the current vcpu number the domain is %s" % \
                  vcpunum_after_set)
     vcpu_list = range(int(vcpunum_after_set))
 
diff --git a/repos/domain/cpu_topology.py b/repos/domain/cpu_topology.py
index ccde97f..5e95057 100644
--- a/repos/domain/cpu_topology.py
+++ b/repos/domain/cpu_topology.py
@@ -35,7 +35,7 @@ def add_cpu_xml(domobj, guestname, sockets, cores, threads, logger):
     """edit domain xml description and insert <cpu> element"""
 
     domxml = domobj.XMLDesc(0)
-    logger.debug('''original guest %s xml :\n%s''' %(guestname, domxml))
+    logger.debug('''original domain %s xml :\n%s''' %(guestname, domxml))
 
     doc = minidom.parseString(domxml)
     cpu = doc.createElement('cpu')
@@ -72,7 +72,7 @@ def domain_undefine(domobj, logger):
     return 0
 
 def domain_define(domobj, domxml, logger):
-    """define new guest xml"""
+    """define new domain xml"""
     try:
         logger.info("define guest")
         conn = domobj._conn;
@@ -130,7 +130,7 @@ def cpu_topology_check(ip, username, password,
     logger.debug("lscpu:")
     logger.debug(output)
     if ret:
-        logger.error("failed to run lscpu on guest OS")
+        logger.error("failed to run lscpu on domain OS")
         return 1
 
     int = 0
@@ -139,13 +139,13 @@ def cpu_topology_check(ip, username, password,
     for item in output.strip().split('\r'):
         if int == 5:
             actual_thread = item.split()[-1]
-            logger.info("the actual thread in the guest is %s" % actual_thread)
+            logger.info("the actual thread in the domain is %s" % actual_thread)
         if int == 6:
             actual_core = item.split()[-1]
-            logger.info("the actual core in the guest is %s" % actual_core)
+            logger.info("the actual core in the domain is %s" % actual_core)
         if int == 7:
             actual_socket = item.split()[-1]
-            logger.info("the actual socket in the guest is %s" % actual_socket)
+            logger.info("the actual socket in the domain is %s" % actual_socket)
 
         int += 1
 
@@ -161,7 +161,7 @@ def cpu_topology_check(ip, username, password,
 
 def cpu_topology(params):
     """ edit domain xml description according to the values
-        and login to the guest to check the results
+        and login to the domain to check the results
     """
     logger = params['logger']
     guestname = params['guestname']
diff --git a/repos/domain/create.py b/repos/domain/create.py
index ed96b36..03bf0c1 100644
--- a/repos/domain/create.py
+++ b/repos/domain/create.py
@@ -67,10 +67,10 @@ def create(params):
     if flags == "start_paused":
         state = domobj.info()[0]
         if state == libvirt.VIR_DOMAIN_PAUSED:
-            logger.info("guest start with state paused successfully")
+            logger.info("domain start with state paused successfully")
             return 0
         else:
-            logger.error("guest state error")
+            logger.error("domain state error")
             return 1
 
     logger.info("get the mac address of vm %s" % guestname)
diff --git a/repos/domain/define.py b/repos/domain/define.py
index 92a98f6..e534d35 100644
--- a/repos/domain/define.py
+++ b/repos/domain/define.py
@@ -45,7 +45,7 @@ def check_define_domain(guestname, virt_type, hostname, username, \
         ret, output = utils.remote_exec_pexpect(hostname, username, \
                                                password, cmd)
         if ret:
-            logger.error("guest %s xml file doesn't exsits" % guestname)
+            logger.error("domain %s xml file doesn't exsits" % guestname)
             return False
         else:
             return True
diff --git a/repos/domain/destroy.py b/repos/domain/destroy.py
index 6359274..0951f95 100644
--- a/repos/domain/destroy.py
+++ b/repos/domain/destroy.py
@@ -46,7 +46,7 @@ def destroy(params):
         domain_names.append(obj.name())
 
     if guestname not in domain_names:
-        logger.error("guest %s doesn't exist or isn't running." % guestname)
+        logger.error("domain %s doesn't exist or isn't running." % guestname)
         return 1
 
     domobj = conn.lookupByName(guestname)
@@ -59,7 +59,7 @@ def destroy(params):
         mac = utils.get_dom_mac_addr(guestname)
         logger.info("get ip by mac address")
         ip = utils.mac_to_ip(mac, 180)
-        logger.info("the ip address of guest is %s" % ip)
+        logger.info("the ip address of domain is %s" % ip)
 
     # Destroy domain
     try:
@@ -80,7 +80,7 @@ def destroy(params):
             logger.info('ping guest')
 
             if utils.do_ping(ip, 30):
-                logger.error('The guest is still active, IP: ' + str(ip))
+                logger.error('The domain is still active, IP: ' + str(ip))
                 return 1
             else:
                 logger.info("domain %s was destroyed successfully" % guestname)
diff --git a/repos/domain/detach_disk.py b/repos/domain/detach_disk.py
index faddea4..c7a9ccb 100644
--- a/repos/domain/detach_disk.py
+++ b/repos/domain/detach_disk.py
@@ -17,7 +17,7 @@ required_params = ('guestname', 'virt_type', 'imagename', 'hdmodel',)
 optional_params = ()
 
 def check_domain_status(domobj):
-    """Check guest current status"""
+    """Check domain current status"""
     state = domobj.info()[0]
     if state == libvirt.VIR_DOMAIN_SHUTOFF or state == libvirt.VIR_DOMAIN_SHUTDOWN:
     # add check function
@@ -71,7 +71,7 @@ def detach_disk(params):
     except libvirtError, e:
         logger.error("API error message: %s, error code is %s" \
                      % (e.message, e.get_error_code()))
-        logger.error("detach %s disk from guest %s" % (imagename, guestname))
+        logger.error("detach %s disk from domain %s" % (imagename, guestname))
         return 1
 
     return 0
diff --git a/repos/domain/detach_interface.py b/repos/domain/detach_interface.py
index 48dc01b..dc101c2 100644
--- a/repos/domain/detach_interface.py
+++ b/repos/domain/detach_interface.py
@@ -17,7 +17,7 @@ required_params = ('guestname', 'ifacetype', 'source', 'nicmodel',)
 optional_params = ()
 
 def check_domain_status(domobj):
-    """Check guest current status"""
+    """Check domain current status"""
     state = domobj.info()[0]
     if state == libvirt.VIR_DOMAIN_SHUTOFF or state == libvirt.VIR_DOMAIN_SHUTDOWN:
     # add check function
@@ -73,7 +73,7 @@ def detach_interface(params):
     except libvirtError, e:
         logger.error("API error message: %s, error code is %s" \
                      % (e.message, e.get_error_code()))
-        logger.error("detach the interface from guest %s" % guestname)
+        logger.error("detach the interface from domain %s" % guestname)
         return 1
 
     return 0
diff --git a/repos/domain/domain_blkinfo.py b/repos/domain/domain_blkinfo.py
index ec7f14c..5845550 100644
--- a/repos/domain/domain_blkinfo.py
+++ b/repos/domain/domain_blkinfo.py
@@ -85,7 +85,7 @@ def domblkinfo(params):
     guestname = params.get('guestname')
     blockdev = params.get('blockdev')
 
-    logger.info("the name of guest is %s" % guestname)
+    logger.info("the name of domain is %s" % guestname)
     logger.info("the block device is %s" % blockdev)
 
     conn = sharedmod.libvirtobj['conn']
diff --git a/repos/domain/domain_id.py b/repos/domain/domain_id.py
index 384bcf3..19a6227 100644
--- a/repos/domain/domain_id.py
+++ b/repos/domain/domain_id.py
@@ -55,7 +55,7 @@ def domid(params):
             return 1
 
     if not doms:
-        logger.info("no running guest available")
+        logger.info("no running domain available")
         return 1
 
     conn = sharedmod.libvirtobj['conn']
diff --git a/repos/domain/domain_list.py b/repos/domain/domain_list.py
index a9cd8a7..d9f136c 100644
--- a/repos/domain/domain_list.py
+++ b/repos/domain/domain_list.py
@@ -48,9 +48,9 @@ def check_all_option(logger):
         if not entry.endswith('.xml'):
             continue
         else:
-            guest = entry[:-4]
-            if guest not in ret:
-                logger.error("guest %s not in the output of virsh list" % guest)
+            domain = entry[:-4]
+            if domain not in ret:
+                logger.error("domain %s not in the output of virsh list" % guest)
                 return 1
     return 0
 
@@ -79,7 +79,7 @@ def check_inactive_option(logger):
             if entry in running_dir_entries:
                 continue
             else:
-                guest = entry[:-4]
+                domain = entry[:-4]
                 inactive_domain.append(guest)
 
     inactive_output = ret.split('\n')
@@ -108,7 +108,7 @@ def check_default_option(logger):
         if not entry.endswith('.xml'):
             continue
         else:
-            guest = entry[:-4]
+            domain = entry[:-4]
             running_domain.append(guest)
 
     active_output = ret.split('\n')
diff --git a/repos/domain/domain_name.py b/repos/domain/domain_name.py
index b9a8e43..ee3b4ed 100644
--- a/repos/domain/domain_name.py
+++ b/repos/domain/domain_name.py
@@ -60,9 +60,9 @@ def domname(params):
             return 1
         domname = domname_ret[:-1]
         if id_domname[id] == domname:
-            logger.info("domid %s corresponds to guest %s" % (id, domname))
+            logger.info("domid %s corresponds to domain %s" % (id, domname))
         else:
-            logger.error("domid %s fails to match to guest %s" % (id, domname))
+            logger.error("domid %s fails to match to domain %s" % (id, domname))
             return 1
 
     return 0
diff --git a/repos/domain/domain_uuid.py b/repos/domain/domain_uuid.py
index 0d3996c..a3ad9e4 100644
--- a/repos/domain/domain_uuid.py
+++ b/repos/domain/domain_uuid.py
@@ -33,7 +33,7 @@ def check_domain_exists(conn, guestname, logger):
         return True
 
 def check_domain_uuid(guestname, UUIDString, logger):
-    """ check UUID String of guest """
+    """ check UUID String of domain """
     status, ret = commands.getstatusoutput(VIRSH_DOMUUID + ' %s' % guestname)
     if status:
         logger.error("executing "+ "\"" +  VIRSH_DOMUUID + ' %s' % guestname + "\"" + " failed")
@@ -53,7 +53,7 @@ def domuuid(params):
     """
     logger = params['logger']
     guestname = params['guestname']
-    logger.info("guest name is %s" % guestname)
+    logger.info("domain name is %s" % guestname)
 
     conn = sharedmod.libvirtobj['conn']
 
diff --git a/repos/domain/domblkinfo.py b/repos/domain/domblkinfo.py
index 557b651..9510e49 100644
--- a/repos/domain/domblkinfo.py
+++ b/repos/domain/domblkinfo.py
@@ -85,7 +85,7 @@ def domblkinfo(params):
     guestname = params.get('guestname')
     blockdev = params.get('blockdev')
 
-    logger.info("the name of guest is %s" % guestname)
+    logger.info("the name of domain is %s" % guestname)
     logger.info("the block device is %s" % blockdev)
 
     conn = sharedmod.libvirtobj['conn']
diff --git a/repos/domain/dump.py b/repos/domain/dump.py
index 98061c4..11ad11b 100644
--- a/repos/domain/dump.py
+++ b/repos/domain/dump.py
@@ -18,32 +18,32 @@ required_params = ('guestname', 'file',)
 optional_params = ()
 
 def check_domain_status(*args):
-    """Check guest current status"""
+    """Check domain current status"""
     (guestname, domobj, logger) = args
 
     state = domobj.info()[0]
     if state == libvirt.VIR_DOMAIN_SHUTOFF or state == libvirt.VIR_DOMAIN_SHUTDOWN:
         domobj.create()
         time.sleep(60)
-        logger.debug("current guest status: %s" % state)
+        logger.debug("current domain status: %s" % state)
     # add check function
         return True
     else:
         return True
 
 def check_domain_kernel(*args):
-    """Check guest kernel version"""
+    """Check domain kernel version"""
     (guestname, logger) = args
 
     mac = utils.get_dom_mac_addr(guestname)
-    logger.debug("guest mac address: %s" %mac)
+    logger.debug("domain mac address: %s" %mac)
 
     ipaddr = utils.mac_to_ip(mac, 15)
     if ipaddr == None:
-        logger.error("can't get guest ip")
+        logger.error("can't get domain ip")
         return None
 
-    logger.debug("guest ip address: %s" %ipaddr)
+    logger.debug("domain ip address: %s" %ipaddr)
 
     kernel = utils.get_remote_kernel(ipaddr, "root", "redhat")
     logger.debug("current kernel version: %s" %kernel)
@@ -129,7 +129,7 @@ def dump(params):
     if check_domain_status(guestname, domobj, logger):
         kernel = check_domain_kernel(guestname, logger)
         if kernel == None:
-            logger.error("can't get guest kernel version")
+            logger.error("can't get domain kernel version")
             return 1
 
         logger.info("dump the core of %s to file %s\n" %(guestname, file))
diff --git a/repos/domain/eventhandler.py b/repos/domain/eventhandler.py
index 47c9642..c90a8a8 100644
--- a/repos/domain/eventhandler.py
+++ b/repos/domain/eventhandler.py
@@ -122,7 +122,7 @@ def bootup_event(domobj, guestname, timeout, logger):
     """bootup the guest, then check the event infomation"""
     global STATE
     STATE = None
-    logger.info("boot up guest %s" % guestname)
+    logger.info("boot up domain %s" % guestname)
     try:
         domobj.create()
     except libvirtError, e:
@@ -152,7 +152,7 @@ def suspend_event(domobj, guestname, timeout, logger):
     """suspend the guest, then check the event infomation"""
     global STATE
     STATE = None
-    logger.info("suspend guest %s" % guestname)
+    logger.info("suspend domain %s" % guestname)
     try:
         domobj.suspend()
     except libvirtError, e:
@@ -182,7 +182,7 @@ def resume_event(domobj, guestname, timeout, logger):
     """resume the guest, then check the event infomation"""
     global STATE
     STATE = None
-    logger.info("resume guest %s" % guestname)
+    logger.info("resume domain %s" % guestname)
     try:
         domobj.resume()
     except libvirtError, e:
diff --git a/repos/domain/ifstats.py b/repos/domain/ifstats.py
index 0afabf6..c6c1402 100644
--- a/repos/domain/ifstats.py
+++ b/repos/domain/ifstats.py
@@ -17,7 +17,7 @@ required_params = ('guestname',)
 optional_params = ()
 
 def check_domain_status(domobj):
-    """Check guest current status"""
+    """Check domain current status"""
     state = domobj.info()[0]
     if state == libvirt.VIR_DOMAIN_SHUTOFF or state == libvirt.VIR_DOMAIN_SHUTDOWN:
     # add check function
diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py
index fe05ca8..80dcf1a 100644
--- a/repos/domain/install_image.py
+++ b/repos/domain/install_image.py
@@ -38,10 +38,10 @@ def install_image(params):
     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" % virt_type)
-    logger.info("the os of guest is %s" % guestos)
-    logger.info("the arch of guest is %s" % guestarch)
+    logger.info("the name of domain is %s" % guestname)
+    logger.info("the type of domain is %s" % virt_type)
+    logger.info("the os of domain is %s" % guestos)
+    logger.info("the arch of domain is %s" % guestarch)
 
     # Connect to local hypervisor connection URI
     hypervisor = utils.get_hypervisor()
@@ -87,11 +87,11 @@ def install_image(params):
         logger.error("fail to define domain %s" % guestname)
         return 1
 
-    logger.info("define guest %s " % guestname)
-    logger.debug("the xml description of guest booting off harddisk is %s" %
+    logger.info("define domain %s " % guestname)
+    logger.debug("the xml description of domain booting off harddisk is %s" %
                   domxml)
 
-    logger.info('boot guest up ...')
+    logger.info('boot domain up ...')
 
     try:
         domobj.create()
diff --git a/repos/domain/install_linux_cdrom.py b/repos/domain/install_linux_cdrom.py
index 26f6557..faa60ab 100644
--- a/repos/domain/install_linux_cdrom.py
+++ b/repos/domain/install_linux_cdrom.py
@@ -43,7 +43,7 @@ HOME_PATH = os.getcwd()
 
 def prepare_cdrom(*args):
     """ to customize boot.iso file to add kickstart
-        file into it for automatic guest installation
+        file into it for automatic domain installation
     """
     ostree, ks, guestname, logger = args
     ks_name = os.path.basename(ks)
@@ -83,8 +83,8 @@ def prepare_cdrom(*args):
     os.chdir(src_path)
 
 def prepare_boot_domain(domobj, dict, logger, installtype):
-    """ After guest installation is over, undefine the guest with
-        bootting off cdrom, to define the guest to boot off harddisk.
+    """ After domain installation is over, undefine the domain with
+        bootting off cdrom, to define the domain to boot off harddisk.
     """
     params = copy.deepcopy(dict)
 
@@ -113,11 +113,11 @@ def prepare_boot_domain(domobj, dict, logger, installtype):
         logger.error("fail to define domain %s" % guestname)
         return 1
 
-    logger.info("define guest %s " % guestname)
-    logger.debug("the xml description of guest booting off harddisk is %s" %
+    logger.info("define domain %s " % guestname)
+    logger.debug("the xml description of domain booting off harddisk is %s" %
                  domxml)
 
-    logger.info('boot guest up ...')
+    logger.info('boot domain up ...')
 
     try:
         domobj.create()
@@ -130,7 +130,7 @@ def prepare_boot_domain(domobj, dict, logger, installtype):
     return 0
 
 def check_domain_state(conn, guestname, logger):
-    """ if a guest with the same name exists, remove it """
+    """ if a domain with the same name exists, remove it """
     running_domains = []
     ids = conn.listDomainsID()
     for id in ids:
@@ -138,7 +138,7 @@ def check_domain_state(conn, guestname, logger):
         running_domains.append(obj.name())
 
     if guestname in running_domains:
-        logger.info("A guest with the same name %s is running!" % guestname)
+        logger.info("A domain with the same name %s is running!" % guestname)
         logger.info("destroy it...")
         domobj = conn.lookupByName(guestname)
         domobj.destroy()
@@ -146,7 +146,7 @@ def check_domain_state(conn, guestname, logger):
     defined_domains = conn.listDefinedDomains()
 
     if guestname in defined_domains:
-        logger.info("undefine the guest with the same name %s" % guestname)
+        logger.info("undefine the domain with the same name %s" % guestname)
         domobj = conn.lookupByName(guestname)
         domobj.undefine()
 
@@ -163,8 +163,8 @@ def install_linux_cdrom(params):
     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" % virt_type)
+    logger.info("the name of domain is %s" % guestname)
+    logger.info("the type of domain is %s" % virt_type)
 
     hypervisor = utils.get_hypervisor()
     conn = sharedmod.libvirtobj['conn']
@@ -260,12 +260,12 @@ def install_linux_cdrom(params):
 
     xmlobj = xml_builder.XmlBuilder()
     domxml = xmlobj.build_domain_install(params)
-    logger.debug('dump installation guest xml:\n%s' % domxml)
+    logger.debug('dump installation domain xml:\n%s' % domxml)
 
     installtype = params.get('type')
 
     if installtype == None or installtype == 'define':
-        logger.info('define guest from xml description')
+        logger.info('define domain from xml description')
         try:
             domobj = conn.defineXML(domxml)
         except libvirtError, e:
@@ -274,7 +274,7 @@ def install_linux_cdrom(params):
             logger.error("fail to define domain %s" % guestname)
             return 1
 
-        logger.info('start installation guest ...')
+        logger.info('start installation domain ...')
 
         try:
             domobj.create()
@@ -284,7 +284,7 @@ def install_linux_cdrom(params):
             logger.error("fail to start domain %s" % guestname)
             return 1
     elif installtype == 'create':
-        logger.info('create guest from xml description')
+        logger.info('create domain from xml description')
         try:
             domobj = conn.createXML(domxml, 0)
         except libvirtError, e:
@@ -299,11 +299,11 @@ def install_linux_cdrom(params):
         if installtype == None or installtype == 'define':
             state = domobj.info()[0]
             if(state == libvirt.VIR_DOMAIN_SHUTOFF):
-                logger.info("guest installaton of define type is complete.")
-                logger.info("boot guest vm off harddisk")
+                logger.info("domain installaton of define type is complete.")
+                logger.info("boot domain vm off harddisk")
                 ret  = prepare_boot_domain(domobj, params, logger, installtype)
                 if ret:
-                    logger.info("booting guest vm off harddisk failed")
+                    logger.info("booting domain vm off harddisk failed")
                     return 1
                 break
             else:
@@ -317,11 +317,11 @@ def install_linux_cdrom(params):
                 domain_names.append(obj.name())
 
             if guestname not in domain_names:
-                logger.info("guest installation of create type is complete.")
+                logger.info("domain installation of create type is complete.")
                 logger.info("define the vm and boot it up")
                 ret = prepare_boot_domain(domobj, params, logger, installtype)
                 if ret:
-                    logger.info("booting guest vm off harddisk failed")
+                    logger.info("booting domain vm off harddisk failed")
                     return 1
                 break
             else:
@@ -331,18 +331,18 @@ def install_linux_cdrom(params):
     if interval == 2400:
         if 'rhel3u9' in guestname:
             logger.info(
-            "guest installaton will be destoryed forcelly for rhel3u9 guest")
+            "domain installaton will be destoryed forcelly for rhel3u9 guest")
             domobj.destroy()
-            logger.info("boot guest vm off harddisk")
+            logger.info("boot domain vm off harddisk")
             ret =  prepare_boot_domain(domobj, params, logger, installtype)
             if ret:
-                logger.info("booting guest vm off harddisk failed")
+                logger.info("booting domain vm off harddisk failed")
                 return 1
         else:
-            logger.info("guest installation timeout 2400s")
+            logger.info("domain installation timeout 2400s")
             return 1
     else:
-        logger.info("guest is booting up")
+        logger.info("domain is booting up")
 
     logger.info("get the mac address of vm %s" % guestname)
     mac = utils.get_dom_mac_addr(guestname)
@@ -387,22 +387,22 @@ def install_linux_cdrom_clean(params):
     if status:
         pass
     else:
-        logger.info("remove guest %s, and its disk image file" % guestname)
+        logger.info("remove domain %s, and its disk image file" % guestname)
         (status, output) = commands.getstatusoutput(VM_STAT % guestname)
         if status:
             (status, output) = commands.getstatusoutput(VM_DESTROY % guestname)
             if status:
-                logger.error("failed to destroy guest %s" % guestname)
+                logger.error("failed to destroy domain %s" % guestname)
                 logger.error("%s" % output)
             else:
                 (status, output) = commands.getstatusoutput(VM_UNDEFINE % guestname)
                 if status:
-                    logger.error("failed to undefine guest %s" % guestname)
+                    logger.error("failed to undefine domain %s" % guestname)
                     logger.error("%s" % output)
         else:
             (status, output) = commands.getstatusoutput(VM_UNDEFINE % guestname)
             if status:
-                logger.error("failed to undefine guest %s" % guestname)
+                logger.error("failed to undefine domain %s" % guestname)
                 logger.error("%s" % output)
 
     if os.path.exists(imgfullpath):
diff --git a/repos/domain/install_linux_check.py b/repos/domain/install_linux_check.py
index c5ee2d8..ea1d41e 100644
--- a/repos/domain/install_linux_check.py
+++ b/repos/domain/install_linux_check.py
@@ -29,7 +29,7 @@ optional_params = ('disksize',
 HOME_PATH = os.getcwd()
 
 def install_linux_check(params):
-    """check guest status after installation, including network ping,
+    """check domain status after installation, including network ping,
        read/write option in guest. return value: 0 - ok; 1 - bad
     """
     global logger
@@ -39,7 +39,7 @@ def install_linux_check(params):
     guestname = params.get('guestname')
     virt_type = params.get('virt_type')
 
-    logger.info("the name of guest is %s" % guestname)
+    logger.info("the name of domain is %s" % guestname)
 
     # Connect to local hypervisor connection URI
     hypervisor = utils.get_hypervisor()
@@ -51,8 +51,8 @@ def install_linux_check(params):
     state = domobj.info()[0]
 
     if(state == libvirt.VIR_DOMAIN_SHUTOFF):
-        logger.info("guest is shutoff, if u want to run this case, \
-                     guest must be started")
+        logger.info("domain is shutoff, if u want to run this case, \
+                     domain must be started")
         return 1
 
     logger.info("get the mac address of vm %s" % guestname)
@@ -76,17 +76,17 @@ def install_linux_check(params):
 
     time.sleep(120)
 
-    logger.info("Now checking guest health after installation")
+    logger.info("Now checking domain health after installation")
 
     domain_name=guestname
     blk_type=params['hdmodel']
     nic_type=params['nicmodel']
     Test_Result = 0
 
-    # Ping guest from host
-    logger.info("check point1: ping guest from host")
+    # Ping domain from host
+    logger.info("check point1: ping domain from host")
     if utils.do_ping(ipaddr, 20) == 1:
-        logger.info("ping current guest successfull")
+        logger.info("ping current domain successfull")
     else:
         logger.error("Error: can't ping current guest")
         Test_Result = 1
@@ -108,39 +108,39 @@ def install_linux_check(params):
         return Test_Result
 
     # Check whether vcpu equals the value set in geust config xml
-    logger.info("check point3: check cpu number in guest equals to \
+    logger.info("check point3: check cpu number in domain equals to \
                  the value set in domain config xml")
     vcpunum_expect = int(utils.get_num_vcpus(domain_name))
     logger.info("vcpu number in domain config xml - %s is %s" % \
                  (domain_name, vcpunum_expect))
     vcpunum_actual = int(utils.get_remote_vcpus(ipaddr, "root", "redhat"))
-    logger.info("The actual vcpu number in guest - %s is %s" %
+    logger.info("The actual vcpu number in domain - %s is %s" %
                  (domain_name, vcpunum_actual))
     if vcpunum_expect == vcpunum_actual:
-        logger.info("The actual vcpu number in guest is \
+        logger.info("The actual vcpu number in domain is \
                      equal to the setting your domain config xml")
     else:
-        logger.error("Error: The actual vcpu number in guest is \
+        logger.error("Error: The actual vcpu number in domain is \
                       NOT equal to the setting your domain config xml")
         Test_Result = 1
         return Test_Result
 
-    # Check whether mem in guest is equal to the value set in domain config xml
-    logger.info("check point4: check whether mem in guest is equal to \
+    # Check whether mem in domain is equal to the value set in domain config xml
+    logger.info("check point4: check whether mem in domain is equal to \
                  the value set in domain config xml")
     mem_expect = utils.get_size_mem(domain_name)
     logger.info("current mem size in domain config xml - %s is %s" %
                  (domain_name, mem_expect))
     mem_actual = utils.get_remote_memory(ipaddr, "root", "redhat")
-    logger.info("The actual mem size in guest - %s is %s" %
+    logger.info("The actual mem size in domain - %s is %s" %
                 (domain_name, mem_actual))
     diff_range = int(mem_expect) * 0.07
     diff = int(mem_expect) - int(mem_actual)
     if int(math.fabs(diff)) < int(diff_range):
-        logger.info("The actual mem size in guest is almost equal to \
+        logger.info("The actual mem size in domain is almost equal to \
                     the setting your domain config xml")
     else:
-        logger.error("Error: The actual mem size in guest is NOT equal to \
+        logger.error("Error: The actual mem size in domain is NOT equal to \
                       the setting your domain config xml")
         Test_Result = 1
         return Test_Result
@@ -163,7 +163,7 @@ def install_linux_check(params):
 
     # Check nic and blk driver in guest
     if 'kvm' in virt_type or 'xenfv' in virt_type:
-        logger.info("check point6: check nic and blk driver in guest is \
+        logger.info("check point6: check nic and blk driver in domain is \
                      expected as your config:")
         if utils.validate_remote_nic_type(ipaddr, "root", "redhat",
            nic_type, logger) == 0 and \
diff --git a/repos/domain/install_linux_net.py b/repos/domain/install_linux_net.py
index 1f6e656..2c04796 100644
--- a/repos/domain/install_linux_net.py
+++ b/repos/domain/install_linux_net.py
@@ -40,8 +40,8 @@ BOOT_DIR = "/var/lib/libvirt/boot/"
 HOME_PATH = os.getcwd()
 
 def prepare_boot_domain(domobj, dict, logger, installtype):
-    """After guest installation is over, undefine the guest with
-       bootting off cdrom, to define the guest to boot off harddisk.
+    """After domain installation is over, undefine the domain with
+       bootting off cdrom, to define the domain to boot off harddisk.
     """
     params = copy.deepcopy(dict)
 
@@ -70,11 +70,11 @@ def prepare_boot_domain(domobj, dict, logger, installtype):
         logger.error("fail to define domain %s" % guestname)
         return 1
 
-    logger.info("define guest %s " % guestname)
-    logger.debug("the xml description of guest booting off harddisk is %s" %
+    logger.info("define domain %s " % guestname)
+    logger.debug("the xml description of domain booting off harddisk is %s" %
                  domxml)
 
-    logger.info('boot guest up ...')
+    logger.info('boot domain up ...')
 
     try:
         domobj.create()
@@ -88,7 +88,7 @@ def prepare_boot_domain(domobj, dict, logger, installtype):
 
 def prepare_cdrom(*args):
     """ to customize boot.iso file to add kickstart
-        file into it for automatic guest installation
+        file into it for automatic domain installation
     """
     ostree, ks, guestname, logger = args
     ks_name = os.path.basename(ks)
@@ -140,8 +140,8 @@ def install_linux_net(params):
     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" % virt_type)
+    logger.info("the name of domain is %s" % guestname)
+    logger.info("the type of domain is %s" % virt_type)
     logger.info("the installation method is %s" % installmethod)
 
     hypervisor = utils.get_hypervisor()
@@ -193,7 +193,7 @@ def install_linux_net(params):
 
     global_parser = global_parser.GlobalParser(envfile)
 
-    # Get http, ftp or nfs url based on guest os, arch
+    # Get http, ftp or nfs url based on domain os, arch
     # and installation method from global.cfg
 
     if installmethod == 'http':
@@ -239,17 +239,17 @@ def install_linux_net(params):
     else:
         logger.error("unknown virt type %s" % virt_type)
 
-    # Prepare guest installation xml
+    # Prepare domain installation xml
     xmlobj = xml_builder.XmlBuilder()
     domxml = xmlobj.build_domain_install(params)
-    logger.debug('dump installation guest xml:\n%s' % domxml)
+    logger.debug('dump installation domain xml:\n%s' % domxml)
 
     #start installation
     conn = sharedmod.libvirtobj['conn']
 
     installtype = params.get('type')
     if installtype == None or installtype == 'define':
-        logger.info('define guest from xml description')
+        logger.info('define domain from xml description')
         try:
             domobj = conn.defineXML(domxml)
         except libvirtError, e:
@@ -258,7 +258,7 @@ def install_linux_net(params):
             logger.error("fail to define domain %s" % guestname)
             return 1
 
-        logger.info('start installation guest ...')
+        logger.info('start installation domain ...')
 
         try:
             domobj.create()
@@ -268,7 +268,7 @@ def install_linux_net(params):
             logger.error("fail to start domain %s" % guestname)
             return 1
     elif installtype == 'create':
-        logger.info('create guest from xml description')
+        logger.info('create domain from xml description')
         try:
             domobj = conn.createXML(domxml, 0)
         except libvirtError, e:
@@ -289,7 +289,7 @@ def install_linux_net(params):
         ret =  prepare_boot_domain(domobj, params, logger, installtype)
 
         if ret:
-            logger.info("booting guest vm off harddisk failed")
+            logger.info("booting domain vm off harddisk failed")
             return 1
         else:
             logger.info("geust is booting up")
@@ -300,12 +300,12 @@ def install_linux_net(params):
             if installtype == None or installtype == 'define':
                 state = domobj.info()[0]
                 if(state == libvirt.VIR_DOMAIN_SHUTOFF):
-                    logger.info("guest installaton of define type is complete")
-                    logger.info("boot guest vm off harddisk")
+                    logger.info("domain installaton of define type is complete")
+                    logger.info("boot domain vm off harddisk")
                     ret  = prepare_boot_domain(domobj, params, logger, \
                                               installtype)
                     if ret:
-                        logger.info("booting guest vm off harddisk failed")
+                        logger.info("booting domain vm off harddisk failed")
                         return 1
                     break
                 else:
@@ -319,12 +319,12 @@ def install_linux_net(params):
                     domain_names.append(obj.name())
 
                 if guestname not in domain_names:
-                    logger.info("guest installation of create type is complete")
+                    logger.info("domain installation of create type is complete")
                     logger.info("define the vm and boot it up")
                     ret = prepare_boot_domain(domobj, params, logger, \
                                              installtype)
                     if ret:
-                        logger.info("booting guest vm off harddisk failed")
+                        logger.info("booting domain vm off harddisk failed")
                         return 1
                     break
                 else:
@@ -332,10 +332,10 @@ def install_linux_net(params):
                     logger.info('%s seconds passed away...' % interval)
 
         if interval == 3600:
-            logger.info("guest installation timeout 3600s")
+            logger.info("domain installation timeout 3600s")
             return 1
         else:
-            logger.info("guest is booting up")
+            logger.info("domain is booting up")
 
     logger.info("get the mac address of vm %s" % guestname)
     mac = utils.get_dom_mac_addr(guestname)
@@ -377,22 +377,22 @@ def install_linux_net_clean(params):
     if status:
         pass
     else:
-        logger.info("remove guest %s, and its disk image file" % guestname)
+        logger.info("remove domain %s, and its disk image file" % guestname)
         (status, output) = commands.getstatusoutput(VM_STAT % guestname)
         if status:
             (status, output) = commands.getstatusoutput(VM_DESTROY % guestname)
             if status:
-                logger.error("failed to destroy guest %s" % guestname)
+                logger.error("failed to destroy domain %s" % guestname)
                 logger.error("%s" % output)
             else:
                 (status, output) = commands.getstatusoutput(VM_UNDEFINE % guestname)
                 if status:
-                    logger.error("failed to undefine guest %s" % guestname)
+                    logger.error("failed to undefine domain %s" % guestname)
                     logger.error("%s" % output)
         else:
             (status, output) = commands.getstatusoutput(VM_UNDEFINE % guestname)
             if status:
-                logger.error("failed to undefine guest %s" % guestname)
+                logger.error("failed to undefine domain %s" % guestname)
                 logger.error("%s" % output)
 
     if os.path.exists(imgfullpath):
diff --git a/repos/domain/install_windows_cdrom.py b/repos/domain/install_windows_cdrom.py
index 15f553f..868c72b 100644
--- a/repos/domain/install_windows_cdrom.py
+++ b/repos/domain/install_windows_cdrom.py
@@ -145,8 +145,8 @@ def prepare_floppy_image(guestname, guestos, guestarch,
     return 0
 
 def prepare_boot_domain(domobj, dict, installtype):
-    """ After guest installation is over, undefine the guest with
-        bootting off cdrom, to define the guest to boot off harddisk.
+    """ After domain installation is over, undefine the domain with
+        bootting off cdrom, to define the domain to boot off harddisk.
     """
     params = copy.deepcopy(dict)
 
@@ -172,11 +172,11 @@ def prepare_boot_domain(domobj, dict, installtype):
         logger.error("fail to define domain %s" % guestname)
         return 1
 
-    logger.info("define guest %s " % guestname)
-    logger.debug("the xml description of guest booting off harddisk is %s" %
+    logger.info("define domain %s " % guestname)
+    logger.debug("the xml description of domain booting off harddisk is %s" %
                  domxml)
 
-    logger.info('boot guest up ...')
+    logger.info('boot domain up ...')
 
     try:
         domobj.create()
@@ -189,7 +189,7 @@ def prepare_boot_domain(domobj, dict, installtype):
     return 0
 
 def install_windows_cdrom(params):
-    """ install a windows guest virtual machine by using iso file """
+    """ install a windows domain virtual machine by using iso file """
     # Initiate and check parameters
     global logger
     logger = params['logger']
@@ -200,8 +200,8 @@ def install_windows_cdrom(params):
     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" % virt_type)
+    logger.info("the name of domain is %s" % guestname)
+    logger.info("the type of domain is %s" % virt_type)
 
     hypervisor = utils.get_hypervisor()
 
@@ -259,7 +259,7 @@ def install_windows_cdrom(params):
     envfile = os.path.join(HOME_PATH, 'global.cfg')
     logger.info("the environment file is %s" % envfile)
 
-    # Get iso file based on guest os and arch from global.cfg
+    # Get iso file based on domain os and arch from global.cfg
     global_parser = global_parser.GlobalParser(envfile)
     iso_file = global_parser.get_value("guest", guestos + '_' + guestarch)
     cdkey = global_parser.get_value("guest", "%s_%s_key" % (guestos, guestarch))
@@ -287,13 +287,13 @@ def install_windows_cdrom(params):
 
     xmlobj = xml_builder.XmlBuilder()
     domxml = xmlobj.build_domain_install_win(params)
-    logger.debug('dump installation guest xml:\n%s' % domxml)
+    logger.debug('dump installation domain xml:\n%s' % domxml)
 
-    # Generate guest xml
+    # Generate domain xml
     conn = sharedmod.libvirtobj['conn']
     installtype = params.get('type')
     if installtype == None or installtype == 'define':
-        logger.info('define guest from xml description')
+        logger.info('define domain from xml description')
         try:
             domobj = conn.defineXML(domxml)
         except libvirtError, e:
@@ -302,7 +302,7 @@ def install_windows_cdrom(params):
             logger.error("fail to define domain %s" % guestname)
             return 1
 
-        logger.info('start installation guest ...')
+        logger.info('start installation domain ...')
 
         try:
             domobj.create()
@@ -312,7 +312,7 @@ def install_windows_cdrom(params):
             logger.error("fail to start domain %s" % guestname)
             return 1
     elif installtype == 'create':
-        logger.info('create guest from xml description')
+        logger.info('create domain from xml description')
         try:
             conn.createXML(domxml, 0)
         except libvirtError, e:
@@ -327,11 +327,11 @@ def install_windows_cdrom(params):
         if installtype == None or installtype == 'define':
             state = domobj.info()[0]
             if(state == libvirt.VIR_DOMAIN_SHUTOFF):
-                logger.info("guest installaton of define type is complete.")
-                logger.info("boot guest vm off harddisk")
+                logger.info("domain installaton of define type is complete.")
+                logger.info("boot domain vm off harddisk")
                 ret  = prepare_boot_domain(domobj, params, installtype)
                 if ret:
-                    logger.info("booting guest vm off harddisk failed")
+                    logger.info("booting domain vm off harddisk failed")
                     return 1
                 break
             else:
@@ -345,11 +345,11 @@ def install_windows_cdrom(params):
                 domain_names.append(obj.name())
 
             if guestname not in domain_names:
-                logger.info("guest installation of create type is complete.")
+                logger.info("domain installation of create type is complete.")
                 logger.info("define the vm and boot it up")
                 ret = prepare_boot_domain(domobj, params, installtype)
                 if ret:
-                    logger.info("booting guest vm off harddisk failed")
+                    logger.info("booting domain vm off harddisk failed")
                     return 1
                 break
             else:
@@ -357,10 +357,10 @@ def install_windows_cdrom(params):
                 logger.info('%s seconds passed away...' % interval)
 
     if interval == 7200:
-        logger.info("guest installation timeout 7200s")
+        logger.info("domain installation timeout 7200s")
         return 1
     else:
-        logger.info("guest is booting up")
+        logger.info("domain is booting up")
 
     logger.info("get the mac address of vm %s" % guestname)
     mac = utils.get_dom_mac_addr(guestname)
@@ -406,22 +406,22 @@ def install_windows_cdrom_clean(params):
     if status:
         pass
     else:
-        logger.info("remove guest %s, and its disk image file" % guestname)
+        logger.info("remove domain %s, and its disk image file" % guestname)
         (status, output) = commands.getstatusoutput(VM_STAT % guestname)
         if status:
             (status, output) = commands.getstatusoutput(VM_DESTROY % guestname)
             if status:
-                logger.error("failed to destroy guest %s" % guestname)
+                logger.error("failed to destroy domain %s" % guestname)
                 logger.error("%s" % output)
             else:
                 (status, output) = commands.getstatusoutput(VM_UNDEFINE % guestname)
                 if status:
-                    logger.error("failed to undefine guest %s" % guestname)
+                    logger.error("failed to undefine domain %s" % guestname)
                     logger.error("%s" % output)
         else:
             (status, output) = commands.getstatusoutput(VM_UNDEFINE % guestname)
             if status:
-                logger.error("failed to undefine guest %s" % guestname)
+                logger.error("failed to undefine domain %s" % guestname)
                 logger.error("%s" % output)
 
     guestos = params.get('guestos')
diff --git a/repos/domain/migrate.py b/repos/domain/migrate.py
index ce1b353..e28d08d 100644
--- a/repos/domain/migrate.py
+++ b/repos/domain/migrate.py
@@ -139,7 +139,7 @@ def ssh_tunnel(hostname, username, password, logger):
     return 0
 
 def migrate(params):
-    """ migrate a guest back and forth between two machines"""
+    """ migrate a domain back and forth between two machines"""
     logger = params['logger']
 
     transport = params['transport']
diff --git a/repos/domain/restore.py b/repos/domain/restore.py
index 8372fbf..99fbd50 100644
--- a/repos/domain/restore.py
+++ b/repos/domain/restore.py
@@ -15,28 +15,28 @@ required_params = ('guestname', 'filepath',)
 optional_params = ()
 
 def get_domain_ipaddr(*args):
-    """Get guest ip address"""
+    """Get domain ip address"""
     (guestname, util, logger) = args
 
     mac = utils.get_dom_mac_addr(guestname)
-    logger.debug("guest mac address: %s" % mac)
+    logger.debug("domain mac address: %s" % mac)
 
     ipaddr = utils.mac_to_ip(mac, 15)
-    logger.debug("guest ip address: %s" % ipaddr)
+    logger.debug("domain ip address: %s" % ipaddr)
 
     if utils.do_ping(ipaddr, 20) == 1:
-        logger.info("ping current guest successfull")
+        logger.info("ping current domain successfull")
         return ipaddr
     else:
         logger.error("Error: can't ping current guest")
         return None
 
 def check_domain_status(*args):
-    """Check guest current status"""
+    """Check domain current status"""
     (domobj, logger) = args
 
     state = domobj.info()[0]
-    logger.debug("current guest status: %s" % state)
+    logger.debug("current domain status: %s" % state)
 
     if state == libvirt.VIR_DOMAIN_SHUTOFF or state == libvirt.VIR_DOMAIN_SHUTDOWN:
         return False
@@ -45,7 +45,7 @@ def check_domain_status(*args):
 
 def check_domain_restore(*args):
     """Check restore domain result, if restore domain is successful,
-       guest status will not be paused and can be ping
+       domain status will not be paused and can be ping
     """
     (guestname, domobj, util, logger) = args
 
@@ -67,7 +67,7 @@ def restore(params):
     domobj = conn.lookupByName(guestname)
 
     if check_domain_status(domobj, logger):
-        logger.error("Error: current guest status is not shutoff or shutdown,\
+        logger.error("Error: current domain status is not shutoff or shutdown,\
                       can not do restore operation")
         return 1
 
diff --git a/repos/domain/save.py b/repos/domain/save.py
index a57f574..50eef09 100644
--- a/repos/domain/save.py
+++ b/repos/domain/save.py
@@ -15,28 +15,28 @@ required_params = ('guestname', 'filepath',)
 optional_params = ()
 
 def get_domain_ipaddr(*args):
-    """Get guest ip address"""
+    """Get domain ip address"""
     (guestname, util, logger) = args
 
     mac = utils.get_dom_mac_addr(guestname)
-    logger.debug("guest mac address: %s" %mac)
+    logger.debug("domain mac address: %s" %mac)
 
     ipaddr = utils.mac_to_ip(mac, 15)
-    logger.debug("guest ip address: %s" %ipaddr)
+    logger.debug("domain ip address: %s" %ipaddr)
 
     if utils.do_ping(ipaddr, 20) == 1:
-        logger.info("ping current guest successfull")
+        logger.info("ping current domain successfull")
         return ipaddr
     else:
         logger.error("Error: can't ping current guest")
         return None
 
 def check_domain_status(*args):
-    """Check guest current status"""
+    """Check domain current status"""
     (domobj, logger) = args
 
     state = domobj.info()[0]
-    logger.debug("current guest status: %s" % state)
+    logger.debug("current domain status: %s" % state)
 
     if state == libvirt.VIR_DOMAIN_SHUTOFF or \
        state == libvirt.VIR_DOMAIN_SHUTDOWN or \
@@ -73,11 +73,11 @@ def save(params):
     ipaddr = get_domain_ipaddr(guestname, util, logger)
 
     if not check_domain_status(domobj, logger):
-        logger.error("Error: current guest status is shutoff")
+        logger.error("Error: current domain status is shutoff")
         return 1
 
     if not ipaddr:
-        logger.error("Error: can't get guest ip address")
+        logger.error("Error: can't get domain ip address")
         return 1
 
     try:
diff --git a/repos/domain/sched_params.py b/repos/domain/sched_params.py
index 59f91d7..ffc7670 100644
--- a/repos/domain/sched_params.py
+++ b/repos/domain/sched_params.py
@@ -15,7 +15,7 @@ required_params = ('guestname', 'capshares',)
 optional_params = ()
 
 def check_domain_status(domobj):
-    """Check guest current status"""
+    """Check domain current status"""
     state = domobj.info()[0]
     if state == libvirt.VIR_DOMAIN_SHUTOFF or state == libvirt.VIR_DOMAIN_SHUTDOWN:
         domobj.create()
diff --git a/repos/domain/shutdown.py b/repos/domain/shutdown.py
index b8154da..510fac5 100644
--- a/repos/domain/shutdown.py
+++ b/repos/domain/shutdown.py
@@ -36,7 +36,7 @@ def shutdown(params):
     mac = utils.get_dom_mac_addr(domname)
     logger.info("get ip by mac address")
     ip = utils.mac_to_ip(mac, 180)
-    logger.info("the ip address of guest is %s" % ip)
+    logger.info("the ip address of domain is %s" % ip)
 
     # Shutdown domain
     try:
@@ -63,7 +63,7 @@ def shutdown(params):
 
     logger.info('ping guest')
     if utils.do_ping(ip, 300):
-        logger.error('The guest is still active, IP: ' + str(ip))
+        logger.error('The domain is still active, IP: ' + str(ip))
         return 1
     else:
         logger.info("domain %s shutdown successfully" % domname)
diff --git a/repos/domain/start.py b/repos/domain/start.py
index 325123d..fb210fb 100644
--- a/repos/domain/start.py
+++ b/repos/domain/start.py
@@ -60,10 +60,10 @@ def start(params):
     if "start_paused" in flags:
         state = domobj.info()[0]
         if state == libvirt.VIR_DOMAIN_PAUSED:
-            logger.info("guest start with state paused successfully")
+            logger.info("domain start with state paused successfully")
             return 0
         else:
-            logger.error("guest state error")
+            logger.error("domain state error")
             return 1
 
     while timeout:
diff --git a/repos/domain/suspend.py b/repos/domain/suspend.py
index 5fe2b83..b427994 100644
--- a/repos/domain/suspend.py
+++ b/repos/domain/suspend.py
@@ -56,7 +56,7 @@ def suspend(params):
 
     logger.info('ping guest')
     if utils.do_ping(ip, 20):
-        logger.error('The guest is still active, IP: ' + str(ip))
+        logger.error('The domain is still active, IP: ' + str(ip))
         return 1
 
     logger.info('PASS')
diff --git a/repos/libvirtd/restart.py b/repos/libvirtd/restart.py
index daa8e50..7afbb21 100644
--- a/repos/libvirtd/restart.py
+++ b/repos/libvirtd/restart.py
@@ -1,6 +1,6 @@
 #!/usr/bin/evn python
-# Restart libvirtd testing. A running guest is required in
-# this test. During libvirtd restart, the guest remains
+# Restart libvirtd testing. A running domain is required in
+# this test. During libvirtd restart, the domain remains
 # running and not affected by libvirtd restart.
 
 import os
diff --git a/repos/regression/multiple_thread_block_on_domain_create.py b/repos/regression/multiple_thread_block_on_domain_create.py
index bae5e12..8556966 100644
--- a/repos/regression/multiple_thread_block_on_domain_create.py
+++ b/repos/regression/multiple_thread_block_on_domain_create.py
@@ -79,10 +79,10 @@ class domain_install(Thread):
         xmlobj = xml_builder.XmlBuilder()
         domxml = xmlobj.build_domain_install(domain_params)
         self.logger.debug("domxml is %s" % domxml)
-        self.logger.info('create guest %sfrom xml description' % self.name)
+        self.logger.info('create domain %sfrom xml description' % self.name)
         try:
             domobj = self.conn.createXML(domxml, 0)
-            self.logger.info('guest %s API createXML returned successfuly' % domobj.name())
+            self.logger.info('domain %s API createXML returned successfuly' % domobj.name())
         except libvirtError, e:
             logger.error("API error message: %s, error code is %s" \
                          % (e.message, e.get_error_code()))
@@ -92,7 +92,7 @@ class domain_install(Thread):
         return 0
 
 def multiple_thread_block_on_domain_create(params):
-    """ spawn multiple threads to create guest simultaneously
+    """ spawn multiple threads to create domain simultaneously
         check the return status of calling create API
     """
     logger = params['logger']
@@ -101,10 +101,10 @@ def multiple_thread_block_on_domain_create(params):
     type = params.get('virt_type')
     num = params.get('guestnum')
 
-    logger.info("the os of guest is %s" % guestos)
-    logger.info("the arch of guest is %s" % arch)
-    logger.info("the type of guest is %s" % type)
-    logger.info("the number of guest we are going to install is %s" % num)
+    logger.info("the os of domain is %s" % guestos)
+    logger.info("the arch of domain is %s" % arch)
+    logger.info("the type of domain is %s" % type)
+    logger.info("the number of domain we are going to install is %s" % num)
 
     hypervisor = utils.get_hypervisor()
     uri = params['uri']
diff --git a/repos/sVirt/domain_nfs_start.py b/repos/sVirt/domain_nfs_start.py
index 650947c..5f5a117 100644
--- a/repos/sVirt/domain_nfs_start.py
+++ b/repos/sVirt/domain_nfs_start.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
-# This test is for start a guest with img file on nfs storage.
+# This test is for start a domain with img file on nfs storage.
 # Under SElinux boolean virt_use_nfs on or off, combine with
 # setting the dynamic_ownership in /etc/libvirt/qemu.conf,
-# check whether the guest can be started or not. The nfs could
+# check whether the domain can be started or not. The nfs could
 # be root_squash or no_root_squash. SElinux should be enabled
 # and enforcing on host.
 
@@ -151,7 +151,7 @@ def domain_nfs_start(params):
             logger.error("Error: fail to destroy domain %s" % guestname)
             return 1
 
-    logger.info("get guest img file path")
+    logger.info("get domain img file path")
     try:
         dom_xml = domobj.XMLDesc(0)
         disk_file = utils.get_disk_path(dom_xml)
diff --git a/repos/snapshot/delete.py b/repos/snapshot/delete.py
index 06ca21e..98dcad6 100644
--- a/repos/snapshot/delete.py
+++ b/repos/snapshot/delete.py
@@ -49,7 +49,7 @@ def delete(params):
 
     conn = sharedmod.libvirtobj['conn']
 
-    logger.info("checking if the guest is poweroff")
+    logger.info("checking if the domain is poweroff")
     if not check_domain_state(conn, guestname, logger):
         logger.error("checking failed")
         return 1
diff --git a/repos/snapshot/file_flag.py b/repos/snapshot/file_flag.py
index 8e4f7ec..df22b5c 100644
--- a/repos/snapshot/file_flag.py
+++ b/repos/snapshot/file_flag.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Create a flag file in the guest OS
+# Create a flag file in the domain OS
 
 import os
 import sys
@@ -33,13 +33,13 @@ def check_domain_running(conn, guestname, logger):
         return True
 
 def make_flag(ipaddr, username, password, logger):
-    """ enter guest OS, create a file in /tmp folder """
+    """ enter domain OS, create a file in /tmp folder """
     ret = utils.remote_exec_pexpect(ipaddr, username, password, MAKE_FLAG)
     if ret == "TIMEOUT!!!":
-        logger.error("connecting to guest OS timeout")
+        logger.error("connecting to domain OS timeout")
         return False
     elif ret != '':
-        logger.error("failed to make flag in guest OS, %s" % ret)
+        logger.error("failed to make flag in domain OS, %s" % ret)
         return False
     else:
         logger.info("flag %s is created in /tmp folder" % FLAG_FILE)
@@ -80,9 +80,9 @@ def file_flag(params):
         return 1
 
     if not make_flag(ipaddr, username, password, logger):
-        logger.error("making flag in guest %s failed" % guestname)
+        logger.error("making flag in domain %s failed" % guestname)
         return 1
     else:
-        logger.info("making flag in guest %s succeeded" % guestname)
+        logger.info("making flag in domain %s succeeded" % guestname)
 
     return 0
diff --git a/repos/snapshot/flag_check.py b/repos/snapshot/flag_check.py
index d7b2020..a4cf7cd 100644
--- a/repos/snapshot/flag_check.py
+++ b/repos/snapshot/flag_check.py
@@ -70,16 +70,16 @@ def flag_check(params):
 
     ret = utils.remote_exec_pexpect(ipaddr, username, password, FLAG_CHECK)
     if ret == "TIMEOUT!!!":
-        logger.error("connecting to guest OS timeout")
+        logger.error("connecting to domain OS timeout")
         return 1
     elif ret == FLAG_FILE and expected_result == "exist":
-        logger.info("checking flag %s in guest OS succeeded" % FLAG_FILE)
+        logger.info("checking flag %s in domain OS succeeded" % FLAG_FILE)
         return 0
     elif ret == FLAG_FILE and expected_result == 'noexist':
         logger.error("flag %s still exist, FAILED." % FLAG_FILE)
         return 1
     elif ret != None and expected_result == "exist":
-        logger.error("no flag %s exists in the guest %s " % (FLAG_FILE,guestname))
+        logger.error("no flag %s exists in the domain %s " % (FLAG_FILE,guestname))
         return 1
     elif ret != None and expected_result == 'noexist':
         logger.info("flag %s is not present, checking succeeded" % FLAG_FILE)
diff --git a/repos/snapshot/internal_create.py b/repos/snapshot/internal_create.py
index fdcbddd..21831bb 100644
--- a/repos/snapshot/internal_create.py
+++ b/repos/snapshot/internal_create.py
@@ -19,7 +19,7 @@ optional_params = ('snapshotname',)
 QEMU_IMAGE_FORMAT = "qemu-img info %s |grep format |awk -F': ' '{print $2}'"
 
 def check_domain_image(domobj, util, guestname, logger):
-    """ensure that the state of guest is poweroff
+    """ensure that the state of domain is poweroff
        and its disk image is the type of qcow2
     """
     dom_xml = domobj.XMLDesc(0)
diff --git a/repos/snapshot/revert.py b/repos/snapshot/revert.py
index f11ba0a..380ed6d 100644
--- a/repos/snapshot/revert.py
+++ b/repos/snapshot/revert.py
@@ -33,7 +33,7 @@ def revert(params):
 
     conn = sharedmod.libvirtobj['conn']
 
-    logger.info("checking if the guest is poweroff")
+    logger.info("checking if the domain is poweroff")
     if not check_domain_state(conn, guestname, logger):
         logger.error("checking failed")
         return 1
diff --git a/repos/snapshot/snapshot_list.py b/repos/snapshot/snapshot_list.py
index 0cfe8f9..9d3423c 100644
--- a/repos/snapshot/snapshot_list.py
+++ b/repos/snapshot/snapshot_list.py
@@ -31,7 +31,7 @@ def snapshot_list(params):
     domain_snapshot_dir = os.path.join(SNAPSHOT_DIR, guestname)
     if (not os.path.isdir(domain_snapshot_dir) or not os.listdir(domain_snapshot_dir)) \
         and snapshot_list == ['']:
-        logger.info("guest %s has no snapshot records" % guestname)
+        logger.info("domain %s has no snapshot records" % guestname)
         return 0
     elif (not os.path.isdir(domain_snapshot_dir) or not os.listdir(domain_snapshot_dir)) \
         and snapshot_list != ['']:
@@ -44,7 +44,7 @@ def snapshot_list(params):
                       os.listdir(domain_snapshot_dir))
         return 1
 
-    logger.info("the path of snapshot for guest %s is %s" % \
+    logger.info("the path of snapshot for domain %s is %s" % \
                   (guestname, domain_snapshot_dir))
 
     snapshot_entries = os.listdir(domain_snapshot_dir)
-- 
1.7.7.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]