Perhaps this set shouldn't be called reorgnize/refactoring, but to keep the same title in the series, it's still used. The mainly work this set do is to use the TERM "domain" instead of "guest" in codes. Osier Yang (17): Destroy src/dist and move env_inspect.py back Substitute guest_names with domain_names Rename src/env_parser.py as src/global_parser.py Substitute guest_ with domain_ Substitue guestobj with domobj Substitute guestxml with domxml Substitute _guest with _domain Substitute 'guest ' with 'domain ' Substitute guestos with os_type Substitute guestarch with os_arch Substitute 'guestip' with 'domip' Substitute 'guest"' with 'domain"' Substitute '\<gname\>' with 'domname' Change the section name 'guest' into 'domain' in global.cfg Substitute 'guestinstxml' with 'domxml' Substitute '\<guest\>' with 'domain' Substitute 'guestname' with 'domain_name' cases/consumption_cpu_topology.conf | 14 +- cases/consumption_domain_nfs_start.conf | 8 +- cases/consumption_eventhandler.conf | 12 +- cases/consumption_libvirtd.conf | 10 +- cases/consumption_ownership_test.conf | 8 +- cases/domain_linux_net_inst.conf | 12 +- cases/linux_domain.conf | 52 +++--- cases/migration/ssh_persistent_paused_no_dst.conf | 74 ++++---- .../migration/ssh_persistent_paused_with_dst.conf | 98 ++++++------ cases/migration/ssh_persistent_running_no_dst.conf | 74 ++++---- .../migration/ssh_persistent_running_with_dst.conf | 98 ++++++------ cases/migration/ssh_transient_paused_no_dst.conf | 48 +++--- cases/migration/ssh_transient_paused_with_dst.conf | 74 ++++---- cases/migration/ssh_transient_running_no_dst.conf | 50 +++--- .../migration/ssh_transient_running_with_dst.conf | 74 ++++---- cases/migration/tcp_persistent_paused_no_dst.conf | 74 ++++---- .../migration/tcp_persistent_paused_with_dst.conf | 98 ++++++------ cases/migration/tcp_persistent_running_no_dst.conf | 74 ++++---- .../migration/tcp_persistent_running_with_dst.conf | 98 ++++++------ .../tcp_sasl_persistent_paused_no_dst.conf | 26 ++-- .../tcp_sasl_persistent_paused_with_dst.conf | 34 ++-- .../tcp_sasl_persistent_running_no_dst.conf | 26 ++-- .../tcp_sasl_persistent_running_with_dst.conf | 34 ++-- .../tcp_sasl_transient_paused_no_dst.conf | 18 +- .../tcp_sasl_transient_paused_with_dst.conf | 26 ++-- .../tcp_sasl_transient_running_no_dst.conf | 18 +- .../tcp_sasl_transient_running_with_dst.conf | 26 ++-- cases/migration/tcp_transient_paused_no_dst.conf | 48 +++--- cases/migration/tcp_transient_paused_with_dst.conf | 74 ++++---- cases/migration/tcp_transient_running_no_dst.conf | 50 +++--- .../migration/tcp_transient_running_with_dst.conf | 74 ++++---- cases/migration/tls_persistent_paused_no_dst.conf | 74 ++++---- .../migration/tls_persistent_paused_with_dst.conf | 98 ++++++------ cases/migration/tls_persistent_running_no_dst.conf | 74 ++++---- .../migration/tls_persistent_running_with_dst.conf | 98 ++++++------ .../tls_sasl_persistent_paused_no_dst.conf | 26 ++-- .../tls_sasl_persistent_paused_with_dst.conf | 34 ++-- .../tls_sasl_persistent_running_no_dst.conf | 26 ++-- .../tls_sasl_persistent_running_with_dst.conf | 34 ++-- .../tls_sasl_transient_paused_no_dst.conf | 18 +- .../tls_sasl_transient_paused_with_dst.conf | 26 ++-- .../tls_sasl_transient_running_no_dst.conf | 18 +- .../tls_sasl_transient_running_with_dst.conf | 26 ++-- cases/migration/tls_transient_paused_no_dst.conf | 48 +++--- cases/migration/tls_transient_paused_with_dst.conf | 74 ++++---- cases/migration/tls_transient_running_no_dst.conf | 50 +++--- .../migration/tls_transient_running_with_dst.conf | 74 ++++---- cases/snapshot.conf | 30 ++-- cases/windows_domain.conf | 50 +++--- .../en-US/Creating_a_configuration_file.xml | 116 ++++++------ .../en-US/Understanding_libvirt-test-API.xml | 8 +- .../en-US/Writing_a_test_case.xml | 74 ++++---- .../libvirt-test-API_Guide/en-US/extras/log.txt | 18 +- global.cfg | 34 ++-- repos/domain/attach_disk.py | 20 +- repos/domain/attach_interface.py | 20 +- repos/domain/autostart.py | 24 ++-- repos/domain/balloon_memory.py | 64 ++++---- repos/domain/blkstats.py | 12 +- repos/domain/console_io.py | 12 +- repos/domain/console_mutex.py | 8 +- repos/domain/cpu_affinity.py | 44 +++--- repos/domain/cpu_topology.py | 72 ++++---- repos/domain/create.py | 22 ++-- repos/domain/define.py | 16 +- repos/domain/destroy.py | 28 ++-- repos/domain/detach_disk.py | 20 +- repos/domain/detach_interface.py | 22 ++-- repos/domain/domain_blkinfo.py | 26 ++-- repos/domain/domain_id.py | 18 +- repos/domain/domain_list.py | 22 ++-- repos/domain/domain_name.py | 4 +- repos/domain/domain_uuid.py | 34 ++-- repos/domain/domblkinfo.py | 26 ++-- repos/domain/dump.py | 42 +++--- repos/domain/eventhandler.py | 60 ++++---- repos/domain/ifstats.py | 20 +- repos/domain/install_image.py | 56 +++--- repos/domain/install_linux_cdrom.py | 182 ++++++++++---------- repos/domain/install_linux_check.py | 78 ++++---- repos/domain/install_linux_net.py | 162 +++++++++--------- repos/domain/install_windows_cdrom.py | 160 +++++++++--------- repos/domain/migrate.py | 52 +++--- repos/domain/ownership_test.py | 26 ++-- repos/domain/reboot.py | 4 +- repos/domain/restore.py | 48 +++--- repos/domain/resume.py | 12 +- repos/domain/save.py | 52 +++--- repos/domain/sched_params.py | 20 +- repos/domain/screenshot.py | 4 +- repos/domain/shutdown.py | 14 +- repos/domain/start.py | 16 +- repos/domain/suspend.py | 12 +- repos/domain/undefine.py | 14 +- repos/domain/update_devflag.py | 52 +++--- repos/libvirtd/qemu_hang.py | 36 ++-- repos/libvirtd/restart.py | 58 +++--- .../multiple_thread_block_on_domain_create.py | 56 +++--- repos/sVirt/domain_nfs_start.py | 112 ++++++------ repos/snapshot/delete.py | 32 ++-- repos/snapshot/file_flag.py | 42 +++--- repos/snapshot/flag_check.py | 34 ++-- repos/snapshot/internal_create.py | 28 ++-- repos/snapshot/revert.py | 22 ++-- repos/snapshot/snapshot_list.py | 26 ++-- src/{dist/redhat => }/env_inspect.py | 14 +- src/generator.py | 13 +- src/{env_parser.py => global_parser.py} | 4 +- src/parser.py | 4 +- utils/dev_num.sh | 10 +- utils/disk_num.sh | 10 +- utils/utils.py | 18 +- utils/xml_builder.py | 12 +- utils/xml_generator.py | 6 +- 114 files changed, 2381 insertions(+), 2388 deletions(-) delete mode 100644 src/dist/__init__.py delete mode 100644 src/dist/redhat/__init__.py rename src/{dist/redhat => }/env_inspect.py (91%) rename src/{env_parser.py => global_parser.py} (97%) Regards, Osier -- 1.7.7.3