From: Wei Liu <wei.liu2@citrix.com>
To: xen-devel@lists.xen.org
Cc: Wei Liu <wei.liu2@citrix.com>,
ian.jackson@eu.citrix.com, ian.campbell@citrix.com
Subject: [PATCH V4 04/12] TestSupport.pm: introduce guest_create
Date: Fri, 21 Mar 2014 16:14:18 +0000 [thread overview]
Message-ID: <1395418466-6997-5-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1395418466-6997-1-git-send-email-wei.liu2@citrix.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Osstest/TestSupport.pm | 10 ++++++++--
ts-redhat-install | 8 ++------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 2a36d9d..df6c4c1 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -92,7 +92,7 @@ BEGIN {
guest_vncsnapshot_begin guest_vncsnapshot_stash
guest_check_remus_ok guest_editconfig
host_involves_pcipassthrough host_get_pcipassthrough_devs
- toolstack
+ toolstack guest_create
await_webspace_fetch_byleaf create_webfile
file_link_contents get_timeout
@@ -1219,7 +1219,13 @@ sub guest_await_reboot ($$$) {
sub guest_destroy ($$) {
my ($ho,$gho) = @_;
target_cmd_root($ho, toolstack()->{Command}." destroy $gho->{Name}", 40);
-}
+}
+
+sub guest_create ($$$) {
+ my ($ho,$gho,$toolstack) = @_;
+ target_cmd_root($ho, "$toolstack create $gho->{CfgPath}", 100);
+}
+
sub target_choose_vg ($$) {
my ($ho, $mbneeded) = @_;
diff --git a/ts-redhat-install b/ts-redhat-install
index c0f4e76..4cff729 100755
--- a/ts-redhat-install
+++ b/ts-redhat-install
@@ -164,13 +164,9 @@ END
});
}
-sub start () {
- target_cmd_root($ho, "$xl create $gho->{CfgPath}", 100);
-}
-
if (!$stage) {
prep();
- start();
+ guest_create($ho,$gho$xl);
} else {
$gho= selectguest($gn,$gho);
}
@@ -180,6 +176,6 @@ if ($stage<2) {
}
rewrite_config_nocd($ho,$gho,$emptyiso);
-start();
+guest_create($ho,$gho,$xl);
guest_await_dhcp_tcp($gho,300);
guest_check_up($gho);
--
1.7.10.4
next prev parent reply other threads:[~2014-03-21 16:14 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-21 16:14 [PATCH V4 00/12] OSSTest: OVMF test job Wei Liu
2014-03-21 16:14 ` [PATCH V4 01/12] TestSupport.pm: add bios option to guest config file Wei Liu
2014-03-21 16:14 ` [PATCH V4 02/12] TestSupport.pm: introduce create_iso_xorriso for creating isos Wei Liu
2014-04-02 16:01 ` Ian Jackson
2014-04-02 17:36 ` Wei Liu
2014-04-02 17:43 ` Ian Jackson
2014-03-21 16:14 ` [PATCH V4 03/12] TestSupport.pm: move rewrite_config_nocd to support library Wei Liu
2014-04-02 16:04 ` Ian Jackson
2014-04-02 17:46 ` Wei Liu
2014-03-21 16:14 ` Wei Liu [this message]
2014-04-02 16:06 ` [PATCH V4 04/12] TestSupport.pm: introduce guest_create Ian Jackson
2014-04-02 17:53 ` Wei Liu
2014-04-03 14:15 ` Ian Jackson
2014-03-21 16:14 ` [PATCH V4 05/12] ts-redhat-install: use $flight, $job and $gn when creating iso Wei Liu
2014-04-02 16:06 ` Ian Jackson
2014-03-21 16:14 ` [PATCH V4 06/12] TestSupport.pm: introduce create_empty_iso Wei Liu
2014-04-02 16:08 ` Ian Jackson
2014-04-02 17:14 ` Wei Liu
2014-04-02 17:26 ` Ian Jackson
2014-03-21 16:14 ` [PATCH V4 07/12] TestSupport.pm: introduce iso_gen_flags_basic Wei Liu
2014-04-02 16:08 ` Ian Jackson
2014-03-21 16:14 ` [PATCH V4 08/12] TestSupport.pm: introduce copy_iso_content_to_dir Wei Liu
2014-04-02 16:10 ` Ian Jackson
2014-04-02 17:26 ` Wei Liu
2014-03-21 16:14 ` [PATCH V4 09/12] Debian.pm: factor out preseed_base Wei Liu
2014-03-21 16:14 ` [PATCH V4 10/12] Introduce ts-debian-hvm-install Wei Liu
2014-04-02 16:15 ` Ian Jackson
2014-04-02 18:17 ` Wei Liu
2014-04-03 14:15 ` Ian Jackson
2014-03-21 16:14 ` [PATCH V4 11/12] sg-run-job: OVMF job Wei Liu
2014-04-02 16:16 ` Ian Jackson
2014-03-21 16:14 ` [PATCH V4 12/12] make-flight: OVMF test flight Wei Liu
2014-04-02 16:27 ` Ian Jackson
2014-04-02 16:31 ` Ian Campbell
2014-04-01 13:43 ` [PATCH V4 00/12] OSSTest: OVMF test job Wei Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395418466-6997-5-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).