* [PATCH OSSTEST v3 01/13] toolstack: save / restore check
2015-07-22 10:13 [PATCH OSSTEST v3 00/13] Libvirt migration and HVM tests Wei Liu
@ 2015-07-22 10:13 ` Wei Liu
2015-07-23 16:11 ` Ian Campbell
2015-07-23 16:16 ` Ian Campbell
2015-07-22 10:13 ` [PATCH OSSTEST v3 02/13] Introduce ts-saverestore-support-check Wei Liu
` (11 subsequent siblings)
12 siblings, 2 replies; 24+ messages in thread
From: Wei Liu @ 2015-07-22 10:13 UTC (permalink / raw)
To: Xen-devel; +Cc: ian.jackson, Wei Liu, ian.campbell
Introduce check_for_command function and use it to check save / restore
functionality.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
v3: remove $TOOLSTACK prefix.
v2: introduce $TOOLSTACK_check_for_command function.
---
Osstest/Toolstack/libvirt.pm | 14 ++++++++++++++
Osstest/Toolstack/xend.pm | 3 +++
Osstest/Toolstack/xl.pm | 16 +++++++++++++---
3 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/Osstest/Toolstack/libvirt.pm b/Osstest/Toolstack/libvirt.pm
index 51a10de..26a2fa3 100644
--- a/Osstest/Toolstack/libvirt.pm
+++ b/Osstest/Toolstack/libvirt.pm
@@ -77,6 +77,20 @@ sub migrate_check ($) {
die "Migration check is not yet supported on libvirt.";
}
+sub check_for_command($$) {
+ my ($self,$cmd) = @_;
+ my $ho = $self->{Host};
+ my $help = target_cmd_output_root($ho, "virsh help");
+ my $rc = ($help =~ m/^\s*$cmd/m) ? 0 : 1;
+ logm("rc=$rc");
+ return $rc;
+}
+
+sub saverestore_check ($) {
+ my ($self) = @_;
+ return check_for_command($self, "save");
+}
+
sub migrate ($) {
my ($self,$gho,$dst,$timeout) = @_;
die "Migration is not yet supported on libvirt.";
diff --git a/Osstest/Toolstack/xend.pm b/Osstest/Toolstack/xend.pm
index 972b3b1..fd54ae1 100644
--- a/Osstest/Toolstack/xend.pm
+++ b/Osstest/Toolstack/xend.pm
@@ -38,4 +38,7 @@ sub new {
# xend always supported migration
sub migrate_check ($) { return 0; }
+# xend always supported save / restore
+sub saverestore_check ($) { return 0; }
+
1;
diff --git a/Osstest/Toolstack/xl.pm b/Osstest/Toolstack/xl.pm
index 3c3d348..1d014ca 100644
--- a/Osstest/Toolstack/xl.pm
+++ b/Osstest/Toolstack/xl.pm
@@ -61,15 +61,25 @@ sub shutdown_wait ($$$) {
target_cmd_root($ho,"$self->{_Command} shutdown -w${acpi_fallback} $gn", $timeout);
}
-sub migrate_check ($) {
- my ($self) = @_;
+sub check_for_command($$) {
+ my ($self,$cmd) = @_;
my $ho = $self->{Host};
my $help = target_cmd_output_root($ho, $self->{_Command}." help");
- my $rc = ($help =~ m/^\s*migrate/m) ? 0 : 1;
+ my $rc = ($help =~ m/^\s*$cmd/m) ? 0 : 1;
logm("rc=$rc");
return $rc;
}
+sub migrate_check ($) {
+ my ($self) = @_;
+ return check_for_command($self, "migrate");
+}
+
+sub saverestore_check ($) {
+ my ($self) = @_;
+ return check_for_command($self, "save");
+}
+
sub migrate ($$$$) {
my ($self,$gho,$dho,$timeout) = @_;
my $sho = $self->{Host};
--
1.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH OSSTEST v3 01/13] toolstack: save / restore check
2015-07-22 10:13 ` [PATCH OSSTEST v3 01/13] toolstack: save / restore check Wei Liu
@ 2015-07-23 16:11 ` Ian Campbell
2015-07-23 16:16 ` Ian Campbell
1 sibling, 0 replies; 24+ messages in thread
From: Ian Campbell @ 2015-07-23 16:11 UTC (permalink / raw)
To: Wei Liu, Xen-devel; +Cc: ian.jackson
On Wed, 2015-07-22 at 11:13 +0100, Wei Liu wrote:
> Introduce check_for_command function and use it to check save /
> restore
> functionality.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH OSSTEST v3 01/13] toolstack: save / restore check
2015-07-22 10:13 ` [PATCH OSSTEST v3 01/13] toolstack: save / restore check Wei Liu
2015-07-23 16:11 ` Ian Campbell
@ 2015-07-23 16:16 ` Ian Campbell
2015-07-23 16:45 ` Wei Liu
1 sibling, 1 reply; 24+ messages in thread
From: Ian Campbell @ 2015-07-23 16:16 UTC (permalink / raw)
To: Wei Liu, Xen-devel; +Cc: ian.jackson
On Wed, 2015-07-22 at 11:13 +0100, Wei Liu wrote:
> +++ b/Osstest/Toolstack/libvirt.pm
> [...]
> +sub saverestore_check ($) {
> + my ($self) = @_;
> + return check_for_command($self, "save");
I just noticed that in a later patch you parse the capabilities xml to
check for migration support. Is save/restore reflected there too?
Parsing structured output from a command designed to produce machine
readable output out to be preferred to parsing help output if possible.
Ian.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH OSSTEST v3 01/13] toolstack: save / restore check
2015-07-23 16:16 ` Ian Campbell
@ 2015-07-23 16:45 ` Wei Liu
2015-07-24 8:54 ` Ian Campbell
0 siblings, 1 reply; 24+ messages in thread
From: Wei Liu @ 2015-07-23 16:45 UTC (permalink / raw)
To: Ian Campbell; +Cc: Xen-devel, Wei Liu, ian.jackson
On Thu, Jul 23, 2015 at 05:16:45PM +0100, Ian Campbell wrote:
> On Wed, 2015-07-22 at 11:13 +0100, Wei Liu wrote:
> > +++ b/Osstest/Toolstack/libvirt.pm
> > [...]
> > +sub saverestore_check ($) {
> > + my ($self) = @_;
> > + return check_for_command($self, "save");
>
> I just noticed that in a later patch you parse the capabilities xml to
> check for migration support. Is save/restore reflected there too?
> Parsing structured output from a command designed to produce machine
> readable output out to be preferred to parsing help output if possible.
>
Anthony helped me check that. The ability to save and restore is not
reflected in xml output of "virsh capabilities".
Wei.
> Ian.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH OSSTEST v3 01/13] toolstack: save / restore check
2015-07-23 16:45 ` Wei Liu
@ 2015-07-24 8:54 ` Ian Campbell
0 siblings, 0 replies; 24+ messages in thread
From: Ian Campbell @ 2015-07-24 8:54 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel, ian.jackson
On Thu, 2015-07-23 at 17:45 +0100, Wei Liu wrote:
> On Thu, Jul 23, 2015 at 05:16:45PM +0100, Ian Campbell wrote:
> > On Wed, 2015-07-22 at 11:13 +0100, Wei Liu wrote:
> > > +++ b/Osstest/Toolstack/libvirt.pm
> > > [...]
> > > +sub saverestore_check ($) {
> > > + my ($self) = @_;
> > > + return check_for_command($self, "save");
> >
> > I just noticed that in a later patch you parse the capabilities xml
> > to
> > check for migration support. Is save/restore reflected there too?
> > Parsing structured output from a command designed to produce
> > machine
> > readable output out to be preferred to parsing help output if
> > possible.
> >
>
> Anthony helped me check that. The ability to save and restore is not
> reflected in xml output of "virsh capabilities".
Thanks for checking, in that case we should do as you have done (i.e.
my ack stands).
Ian.
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH OSSTEST v3 02/13] Introduce ts-saverestore-support-check
2015-07-22 10:13 [PATCH OSSTEST v3 00/13] Libvirt migration and HVM tests Wei Liu
2015-07-22 10:13 ` [PATCH OSSTEST v3 01/13] toolstack: save / restore check Wei Liu
@ 2015-07-22 10:13 ` Wei Liu
2015-07-23 16:12 ` Ian Campbell
2015-07-22 10:13 ` [PATCH OSSTEST v3 03/13] osstest migrate support check catch -> variables Wei Liu
` (10 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Wei Liu @ 2015-07-22 10:13 UTC (permalink / raw)
To: Xen-devel; +Cc: ian.jackson, Wei Liu, ian.campbell
We need this script because we're going to separate the concept of save
/ restore and migration later.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
v3: takes $gn
---
ts-saverestore-support-check | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
create mode 100755 ts-saverestore-support-check
diff --git a/ts-saverestore-support-check b/ts-saverestore-support-check
new file mode 100755
index 0000000..fcbcb1c
--- /dev/null
+++ b/ts-saverestore-support-check
@@ -0,0 +1,28 @@
+#!/usr/bin/perl -w
+# This is part of "osstest", an automated testing framework for Xen.
+# Copyright (C) 2015 Citrix Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+use strict qw(vars);
+use DBI;
+use Osstest;
+use Osstest::TestSupport;
+
+tsreadconfig();
+
+our ($whhost, $gn) = @ARGV;
+our $ho = selecthost($whhost);
+
+exit(toolstack($ho)->saverestore_check());
--
1.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH OSSTEST v3 03/13] osstest migrate support check catch -> variables
2015-07-22 10:13 [PATCH OSSTEST v3 00/13] Libvirt migration and HVM tests Wei Liu
2015-07-22 10:13 ` [PATCH OSSTEST v3 01/13] toolstack: save / restore check Wei Liu
2015-07-22 10:13 ` [PATCH OSSTEST v3 02/13] Introduce ts-saverestore-support-check Wei Liu
@ 2015-07-22 10:13 ` Wei Liu
2015-07-22 10:13 ` [PATCH OSSTEST v3 04/13] toolstack/libvirt: guest migrate, save and restore support Wei Liu
` (9 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Wei Liu @ 2015-07-22 10:13 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
From: Ian Jackson <Ian.Jackson@eu.citrix.com>
The goal here is to skip the following test steps if the check fails.
Instead of using catch to turn an exception into value, we can just
use spawn-ts and reap-ts to do that. This pattern is useful when we add
in extra check for save / restore check later.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
[ wei: write commit message ]
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
sg-run-job | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sg-run-job b/sg-run-job
index d53fd83..61f88fb 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -300,7 +300,9 @@ proc run-job/test-pair {} {
}
proc test-guest-migr {g} {
- if {[catch { run-ts . = ts-migrate-support-check + host $g }]} return
+ set to_reap [spawn-ts . = ts-migrate-support-check + host $g]
+ set can_migrate [reap-ts $to_reap]
+ if {!$can_migrate} return
foreach iteration {{} .2} {
run-ts . =$iteration ts-guest-saverestore + host $g
--
1.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH OSSTEST v3 04/13] toolstack/libvirt: guest migrate, save and restore support
2015-07-22 10:13 [PATCH OSSTEST v3 00/13] Libvirt migration and HVM tests Wei Liu
` (2 preceding siblings ...)
2015-07-22 10:13 ` [PATCH OSSTEST v3 03/13] osstest migrate support check catch -> variables Wei Liu
@ 2015-07-22 10:13 ` Wei Liu
2015-07-22 10:13 ` [PATCH OSSTEST v3 05/13] toolstack: distinguish local and remote migration support Wei Liu
` (8 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Wei Liu @ 2015-07-22 10:13 UTC (permalink / raw)
To: Xen-devel; +Cc: ian.jackson, Wei Liu, ian.campbell
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
v3: move this patch earlier in series
---
Osstest/Toolstack/libvirt.pm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/Osstest/Toolstack/libvirt.pm b/Osstest/Toolstack/libvirt.pm
index 26a2fa3..5c6ca90 100644
--- a/Osstest/Toolstack/libvirt.pm
+++ b/Osstest/Toolstack/libvirt.pm
@@ -93,17 +93,22 @@ sub saverestore_check ($) {
sub migrate ($) {
my ($self,$gho,$dst,$timeout) = @_;
- die "Migration is not yet supported on libvirt.";
+ my $ho = $self->{Host};
+ my $gn = $gho->{Name};
+ target_cmd_root($ho, "virsh migrate $gn $dst", $timeout);
}
sub save ($$$$) {
my ($self,$gho,$f,$timeout) = @_;
- die "Save is not yet supported on libvirt.";
+ my $ho = $self->{Host};
+ my $gn = $gho->{Name};
+ target_cmd_root($ho, "virsh save $gn $f", $timeout);
}
sub restore ($$$$) {
my ($self,$gho,$f,$timeout) = @_;
- die "Restore is not yet supported on libvirt.";
+ my $ho = $self->{Host};
+ target_cmd_root($ho, "virsh restore $f", $timeout);
}
1;
--
1.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH OSSTEST v3 05/13] toolstack: distinguish local and remote migration support
2015-07-22 10:13 [PATCH OSSTEST v3 00/13] Libvirt migration and HVM tests Wei Liu
` (3 preceding siblings ...)
2015-07-22 10:13 ` [PATCH OSSTEST v3 04/13] toolstack/libvirt: guest migrate, save and restore support Wei Liu
@ 2015-07-22 10:13 ` Wei Liu
2015-07-23 16:15 ` Ian Campbell
2015-07-22 10:13 ` [PATCH OSSTEST v3 06/13] sg-run-job: remove save/restore dependency on local " Wei Liu
` (7 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Wei Liu @ 2015-07-22 10:13 UTC (permalink / raw)
To: Xen-devel; +Cc: ian.jackson, Wei Liu, ian.campbell
Libvirt supports migrating a guest to remote host but not local host.
Distinguish the concept of local migration support and remote migration
support.
Toolstack's migrate_check now takes an extra argument to indicate which
mode we're interested in.
In sg-run-job we still check for local migration support because that's
the implicit target in test-guest-migr. Libvirt will still be blocked.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
v3: use tuple to get all three arguments at once
v2: use bool instead of "local" "remote" string
---
Osstest/Toolstack/libvirt.pm | 18 +++++++++++++++---
Osstest/Toolstack/xend.pm | 2 +-
Osstest/Toolstack/xl.pm | 4 ++--
sg-run-job | 2 +-
ts-migrate-support-check | 7 +++++--
5 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/Osstest/Toolstack/libvirt.pm b/Osstest/Toolstack/libvirt.pm
index 5c6ca90..32dca84 100644
--- a/Osstest/Toolstack/libvirt.pm
+++ b/Osstest/Toolstack/libvirt.pm
@@ -72,9 +72,21 @@ sub shutdown_wait ($$$) {
guest_await_destroy($gho,$timeout);
}
-sub migrate_check ($) {
- my ($self) = @_;
- die "Migration check is not yet supported on libvirt.";
+sub migrate_check ($$) {
+ my ($self, $local) = @_;
+ my $rc;
+
+ if ($local) {
+ # local migration is not supported
+ $rc = 1;
+ } else {
+ my $ho = $self->{Host};
+ my $caps = target_cmd_output_root($ho, "virsh capabilities");
+ $rc = ($caps =~ m/<migration_features>/) ? 0 : 1
+ }
+
+ logm("rc=$rc");
+ return $rc;
}
sub check_for_command($$) {
diff --git a/Osstest/Toolstack/xend.pm b/Osstest/Toolstack/xend.pm
index fd54ae1..b435938 100644
--- a/Osstest/Toolstack/xend.pm
+++ b/Osstest/Toolstack/xend.pm
@@ -36,7 +36,7 @@ sub new {
}
# xend always supported migration
-sub migrate_check ($) { return 0; }
+sub migrate_check ($$) { return 0; }
# xend always supported save / restore
sub saverestore_check ($) { return 0; }
diff --git a/Osstest/Toolstack/xl.pm b/Osstest/Toolstack/xl.pm
index 1d014ca..67564b3 100644
--- a/Osstest/Toolstack/xl.pm
+++ b/Osstest/Toolstack/xl.pm
@@ -70,8 +70,8 @@ sub check_for_command($$) {
return $rc;
}
-sub migrate_check ($) {
- my ($self) = @_;
+sub migrate_check ($$) {
+ my ($self,$local) = @_;
return check_for_command($self, "migrate");
}
diff --git a/sg-run-job b/sg-run-job
index 61f88fb..16fcfc1 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -300,7 +300,7 @@ proc run-job/test-pair {} {
}
proc test-guest-migr {g} {
- set to_reap [spawn-ts . = ts-migrate-support-check + host $g]
+ set to_reap [spawn-ts . = ts-migrate-support-check + host $g 1]
set can_migrate [reap-ts $to_reap]
if {!$can_migrate} return
diff --git a/ts-migrate-support-check b/ts-migrate-support-check
index cd41f68..a1440a2 100755
--- a/ts-migrate-support-check
+++ b/ts-migrate-support-check
@@ -22,6 +22,9 @@ use Osstest::TestSupport;
tsreadconfig();
-our $ho = selecthost($ARGV[0]);
-exit(toolstack($ho)->migrate_check());
+# Mode should be either 1 ("local") or 0 ("remote")
+our ($whhost, $gn, $mode) = @ARGV;
+our $ho = selecthost($whhost);
+
+exit(toolstack($ho)->migrate_check($mode));
--
1.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH OSSTEST v3 06/13] sg-run-job: remove save/restore dependency on local migration support
2015-07-22 10:13 [PATCH OSSTEST v3 00/13] Libvirt migration and HVM tests Wei Liu
` (4 preceding siblings ...)
2015-07-22 10:13 ` [PATCH OSSTEST v3 05/13] toolstack: distinguish local and remote migration support Wei Liu
@ 2015-07-22 10:13 ` Wei Liu
2015-07-23 16:17 ` Ian Campbell
2015-07-22 10:13 ` [PATCH OSSTEST v3 07/13] ts-xen-build-prep: install ebtables Wei Liu
` (6 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Wei Liu @ 2015-07-22 10:13 UTC (permalink / raw)
To: Xen-devel; +Cc: ian.jackson, Wei Liu, ian.campbell
Since we've introduced different checks for save / restore and local
migration, it's possible to run save / restore tests without running
local migration tests.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
v3: ts-saverestore-support-check takes $g
---
sg-run-job | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/sg-run-job b/sg-run-job
index 16fcfc1..6fad114 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -302,13 +302,20 @@ proc run-job/test-pair {} {
proc test-guest-migr {g} {
set to_reap [spawn-ts . = ts-migrate-support-check + host $g 1]
set can_migrate [reap-ts $to_reap]
- if {!$can_migrate} return
+ set to_reap [spawn-ts . = ts-saverestore-support-check + host $g]
+ set can_saverestore [reap-ts $to_reap]
foreach iteration {{} .2} {
- run-ts . =$iteration ts-guest-saverestore + host $g
- run-ts . =$iteration ts-guest-localmigrate + host $g
+ if {$can_saverestore} {
+ run-ts . =$iteration ts-guest-saverestore + host $g
+ }
+ if {$can_migrate} {
+ run-ts . =$iteration ts-guest-localmigrate + host $g
+ }
+ }
+ if {$can_migrate} {
+ run-ts . = ts-guest-localmigrate x10 + host $g
}
- run-ts . = ts-guest-localmigrate x10 + host $g
}
proc test-guest {g} {
--
1.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH OSSTEST v3 07/13] ts-xen-build-prep: install ebtables
2015-07-22 10:13 [PATCH OSSTEST v3 00/13] Libvirt migration and HVM tests Wei Liu
` (5 preceding siblings ...)
2015-07-22 10:13 ` [PATCH OSSTEST v3 06/13] sg-run-job: remove save/restore dependency on local " Wei Liu
@ 2015-07-22 10:13 ` Wei Liu
2015-07-22 10:13 ` [PATCH OSSTEST v3 08/13] ts-libvirt-build: run libvirt test suite Wei Liu
` (5 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Wei Liu @ 2015-07-22 10:13 UTC (permalink / raw)
To: Xen-devel; +Cc: ian.jackson, Wei Liu, ian.campbell
Libvirt's test suite needs it.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
ts-xen-build-prep | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index 9a3b523..03ad35c 100755
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -206,7 +206,7 @@ sub prep () {
autoconf automake libtool xsltproc
libxml2-utils libxml2-dev
libdevmapper-dev w3c-dtd-xhtml libxml-xpath-perl
- ccache nasm checkpolicy);
+ ccache nasm checkpolicy ebtables);
if ($ho->{Suite} =~ m/wheezy|squeeze|lenny/) {
push(@packages, "libnl-dev");
--
1.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH OSSTEST v3 08/13] ts-libvirt-build: run libvirt test suite
2015-07-22 10:13 [PATCH OSSTEST v3 00/13] Libvirt migration and HVM tests Wei Liu
` (6 preceding siblings ...)
2015-07-22 10:13 ` [PATCH OSSTEST v3 07/13] ts-xen-build-prep: install ebtables Wei Liu
@ 2015-07-22 10:13 ` Wei Liu
2015-07-22 10:13 ` [PATCH OSSTEST v3 09/13] ts-debian-hvm-install: stub out libvirt + ovmf / rombios Wei Liu
` (4 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Wei Liu @ 2015-07-22 10:13 UTC (permalink / raw)
To: Xen-devel; +Cc: ian.jackson, Wei Liu, ian.campbell
We're interested in xlconfigtest.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
ts-libvirt-build | 35 ++++++++++++++++++++++++++---------
1 file changed, 26 insertions(+), 9 deletions(-)
diff --git a/ts-libvirt-build b/ts-libvirt-build
index f764b53..713bea0 100755
--- a/ts-libvirt-build
+++ b/ts-libvirt-build
@@ -27,6 +27,7 @@ builddirsprops();
our %submodmap = qw(gnulib gnulib);
our $submodules;
+our $xenprefix;
sub libvirtd_init ();
@@ -39,15 +40,6 @@ sub checkout () {
}
sub config() {
- my $xenprefix;
- foreach (qw(/usr/local /usr)) {
- if (target_file_exists($ho, "$xendist$_/lib/libxenctrl.so")) {
- $xenprefix="$xendist$_";
- last;
- }
- }
- die "no xen prefix" unless $xenprefix;
-
# Uses --no-git because otherwise autogen.sh will undo
# submodulefixup's attempts to honour
# revision_libvirt_gnulib. This in turn requires that we specify
@@ -75,6 +67,19 @@ sub build() {
END
}
+sub runtest() {
+ target_cmd_build($ho, 3600, $builddir, <<END);
+ cd libvirt
+ rm -f ../libvirt-test-suite-ok-stamp
+ (LD_LIBRARY_PATH=$xenprefix/lib/ \\
+ make check VIR_TEST_EXPENSIVE=1 2>&1 && \\
+ touch ../libvirt-test-suite-ok-stamp) \\
+ | tee ../libvirt-test-suite-log
+ test -f ../libvirt-test-suite-ok-stamp #/
+ echo ok.
+END
+}
+
sub install() {
target_cmd_build($ho, 300, $builddir, <<END);
mkdir -p dist
@@ -90,9 +95,21 @@ END
END
}
+sub setxenprefix() {
+ foreach (qw(/usr/local /usr)) {
+ if (target_file_exists($ho, "$xendist$_/lib/libxenctrl.so")) {
+ $xenprefix="$xendist$_";
+ last;
+ }
+ }
+ die "no xen prefix" unless $xenprefix;
+}
+
checkout();
+setxenprefix();
config();
build();
+runtest();
install();
built_stash($ho, $builddir, 'dist', 'libvirtdist');
--
1.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH OSSTEST v3 09/13] ts-debian-hvm-install: stub out libvirt + ovmf / rombios
2015-07-22 10:13 [PATCH OSSTEST v3 00/13] Libvirt migration and HVM tests Wei Liu
` (7 preceding siblings ...)
2015-07-22 10:13 ` [PATCH OSSTEST v3 08/13] ts-libvirt-build: run libvirt test suite Wei Liu
@ 2015-07-22 10:13 ` Wei Liu
2015-07-23 16:18 ` Ian Campbell
2015-07-22 10:13 ` [PATCH OSSTEST v3 10/13] TestSupport: don't put kernel= in HVM config when using xl and libvirt Wei Liu
` (3 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Wei Liu @ 2015-07-22 10:13 UTC (permalink / raw)
To: Xen-devel; +Cc: ian.jackson, Wei Liu, ian.campbell
Libvirt's configuration converter doesn't know how to deal with BIOS
selection. The end result is it always use the default one (seabios).
Stub out ovmf and rombios to avoid false positive results.
This restriction will be removed once libvirt's converter knows how to
deal with BIOS selection.
Note that we don't expect to see such configurations any time soon.
These configurations will be filtered in make-flight. The changes here
are more of an extra level of safety check.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
v3: add more information to commit message
---
ts-debian-hvm-install | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index f05b1a7..bd16506 100755
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -28,6 +28,13 @@ if (@ARGV && $ARGV[0] =~ m/^--stage(\d+)$/) { $stage=$1; shift @ARGV; }
defined($r{bios}) or die "Need to define which bios to use";
+# Libvirt doesn't know anything about bios. It will always use the
+# default one (seabios). Stub out rombios and ovmf to avoid false
+# positive results.
+if ($r{bios} =~ m/ovmf|rombios/ && $r{toolstack} eq 'libvirt') {
+ die "libvirt + $r{bios} is not supported yet.";
+}
+
our ($whhost,$gn) = @ARGV;
$whhost ||= 'host';
$gn ||= 'debianhvm';
--
1.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH OSSTEST v3 09/13] ts-debian-hvm-install: stub out libvirt + ovmf / rombios
2015-07-22 10:13 ` [PATCH OSSTEST v3 09/13] ts-debian-hvm-install: stub out libvirt + ovmf / rombios Wei Liu
@ 2015-07-23 16:18 ` Ian Campbell
0 siblings, 0 replies; 24+ messages in thread
From: Ian Campbell @ 2015-07-23 16:18 UTC (permalink / raw)
To: Wei Liu, Xen-devel; +Cc: ian.jackson
On Wed, 2015-07-22 at 11:13 +0100, Wei Liu wrote:
> Libvirt's configuration converter doesn't know how to deal with BIOS
> selection. The end result is it always use the default one (seabios).
> Stub out ovmf and rombios to avoid false positive results.
>
> This restriction will be removed once libvirt's converter knows how
> to
> deal with BIOS selection.
>
> Note that we don't expect to see such configurations any time soon.
> These configurations will be filtered in make-flight. The changes
> here
> are more of an extra level of safety check.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH OSSTEST v3 10/13] TestSupport: don't put kernel= in HVM config when using xl and libvirt
2015-07-22 10:13 [PATCH OSSTEST v3 00/13] Libvirt migration and HVM tests Wei Liu
` (8 preceding siblings ...)
2015-07-22 10:13 ` [PATCH OSSTEST v3 09/13] ts-debian-hvm-install: stub out libvirt + ovmf / rombios Wei Liu
@ 2015-07-22 10:13 ` Wei Liu
2015-07-23 16:19 ` Ian Campbell
2015-07-22 10:13 ` [PATCH OSSTEST v3 11/13] make-flight: debian hvm tests with libvirt Wei Liu
` (2 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Wei Liu @ 2015-07-22 10:13 UTC (permalink / raw)
To: Xen-devel; +Cc: ian.jackson, Wei Liu, ian.campbell
Setting kernel to hvmloader is ignored in xl but not in libvirt. Libvirt
config converter will translate that then pass it to QEMU. QEMU
complains there is no kernel called hvmloader and exits.
Remove this option for xl and libvirt. Xl is not affected and libvirt
will be able to create HVM guest. Xend might still need it.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
v3: xend still needs that option
---
Osstest/TestSupport.pm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 66dc218..37dbe55 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1624,8 +1624,11 @@ sub more_prepareguest_hvm ($$$$;@) {
}
my $disks = join ",\t\t\n", map { "'$_'" } @disks;
+ my $kernel = $ho->{Toolstack}->{Name} =~ m/xend/ ?
+ "kernel = 'hvmloader'" : '';
+
my $cfg = <<END;
-kernel = 'hvmloader'
+$kernel
builder = 'hvm'
#
disk = [
--
1.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH OSSTEST v3 11/13] make-flight: debian hvm tests with libvirt
2015-07-22 10:13 [PATCH OSSTEST v3 00/13] Libvirt migration and HVM tests Wei Liu
` (9 preceding siblings ...)
2015-07-22 10:13 ` [PATCH OSSTEST v3 10/13] TestSupport: don't put kernel= in HVM config when using xl and libvirt Wei Liu
@ 2015-07-22 10:13 ` Wei Liu
2015-07-23 16:21 ` Ian Campbell
2015-07-22 10:13 ` [PATCH OSSTEST v3 12/13] make-flight, mfi-common: rename onetoolstack to pairtoolstack Wei Liu
2015-07-22 10:13 ` [PATCH OSSTEST v3 13/13] make-flight, mfi-common: create live migration test for libvirt Wei Liu
12 siblings, 1 reply; 24+ messages in thread
From: Wei Liu @ 2015-07-22 10:13 UTC (permalink / raw)
To: Xen-devel; +Cc: ian.jackson, Wei Liu, ian.campbell
Since upstream QEMU is the default, that's what libvirt is using. We
generate test case to test libvirt with upstream QEMU.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
See #0 for runvars diff
v3: make toolstack second argument, only generate -xsm test
---
make-flight | 37 ++++++++++++++++++++++++-------------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/make-flight b/make-flight
index 3b31939..49f205e 100755
--- a/make-flight
+++ b/make-flight
@@ -100,7 +100,9 @@ job_create_test_filter_callback () {
*)
case "$job" in
*-qemuu-*)
- if [ "x$toolstack" != xxl ]; then return 1; fi
+ if [ x$toolstack != xxl -a x$toolstack != xlibvirt ];then
+ return 1;
+ fi
;;
esac
;;
@@ -216,19 +218,20 @@ do_hvm_win7_x64_tests () {
do_hvm_debian_test_one () {
testname=$1
- bios=$2
- xsm=$3
- stubdom=$4
+ toolstack=$2
+ bios=$3
+ xsm=$4
+ stubdom=$5
stubdom_suffix=""
stubdom_runvar=""
- if [ x$stubdom != x ]; then
+ if [ x$stubdom = xtrue ]; then
stubdom_suffix="-stubdom"
stubdom_runvar="debianhvm_stubdom=$stubdom"
fi
- job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix$stubdom_suffix-$testname-amd64\
- test-debianhvm xl $xenarch $dom0arch $qemuu_runvar \
+ job_create_test test-$xenarch$kern-$dom0arch-$toolstack$qemuu_suffix$stubdom_suffix-$testname-amd64\
+ test-debianhvm $toolstack $xenarch $dom0arch $qemuu_runvar \
enable_xsm=$xsm \
$stubdom_runvar \
debianhvm_image=debian-7.2.0-amd64-CD-1.iso \
@@ -243,20 +246,28 @@ do_hvm_debian_tests() {
return
fi
- # QEMU upstream supports ovmf and seabios
+ # QEMU upstream supports
+ # 1. ovmf + xl
+ # 2. seabios + xl
+ # 3. seabios + libvirt
+ # For libvirt we only generate -xsm test case.
if [ "x$qemuu_suffix" == "x-qemuu" ]; then
- do_hvm_debian_test_one ovmf ovmf false
+ do_hvm_debian_test_one ovmf xl ovmf false
for xsm in $xsms ; do
- do_hvm_debian_test_one debianhvm seabios $xsm
+ do_hvm_debian_test_one debianhvm xl seabios $xsm
+ if [ x$xsm = xtrue ]; then
+ do_hvm_debian_test_one debianhvm libvirt seabios $xsm
+ fi
done
fi
# QEMU traditional supports rombios and stubdom
+ # Only test xl with QEMU traditional
if [ "x$qemuu_suffix" == "x-qemut" ]; then
for xsm in $xsms ; do
- do_hvm_debian_test_one debianhvm rombios $xsm
- if [ x$xsm = xtrue ]; then
- do_hvm_debian_test_one debianhvm rombios $xsm true
+ do_hvm_debian_test_one debianhvm xl rombios $xsm
+ if [ x$xsm = xtrue -a x$toolstack = xxl ]; then
+ do_hvm_debian_test_one debianhvm xl rombios $xsm true
fi
done
fi
--
1.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH OSSTEST v3 12/13] make-flight, mfi-common: rename onetoolstack to pairtoolstack
2015-07-22 10:13 [PATCH OSSTEST v3 00/13] Libvirt migration and HVM tests Wei Liu
` (10 preceding siblings ...)
2015-07-22 10:13 ` [PATCH OSSTEST v3 11/13] make-flight: debian hvm tests with libvirt Wei Liu
@ 2015-07-22 10:13 ` Wei Liu
2015-07-22 10:13 ` [PATCH OSSTEST v3 13/13] make-flight, mfi-common: create live migration test for libvirt Wei Liu
12 siblings, 0 replies; 24+ messages in thread
From: Wei Liu @ 2015-07-22 10:13 UTC (permalink / raw)
To: Xen-devel; +Cc: ian.jackson, Wei Liu, ian.campbell
The name "onetoolstack" in confusing. Currently it's in fact referring
to the toolstack used to test pair migration, so rename it to
"pairtoolstack".
No functional changes introduced.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
make-flight | 2 +-
mfi-common | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/make-flight b/make-flight
index 49f205e..dde85c9 100755
--- a/make-flight
+++ b/make-flight
@@ -466,7 +466,7 @@ test_matrix_do_one () {
# Test live migration
job_create_test test-$xenarch$kern-$dom0arch-pair test-pair \
- $onetoolstack $xenarch $dom0arch \
+ $pairtoolstack $xenarch $dom0arch \
!host !host_hostflags \
$debian_runvars \
all_hostflags=$most_hostflags,equiv-1
diff --git a/mfi-common b/mfi-common
index a9e966f..e517019 100644
--- a/mfi-common
+++ b/mfi-common
@@ -313,10 +313,10 @@ job_create_test () {
test_matrix_iterate () {
case "$xenbranch" in
- xen-3.*-testing) onetoolstack=xend ;;
- xen-4.0-testing) onetoolstack=xend ;;
- xen-4.1-testing) onetoolstack=xend ;;
- *) onetoolstack=xl ;;
+ xen-3.*-testing) pairtoolstack=xend ;;
+ xen-4.0-testing) pairtoolstack=xend ;;
+ xen-4.1-testing) pairtoolstack=xend ;;
+ *) pairtoolstack=xl ;;
esac
for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
--
1.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH OSSTEST v3 13/13] make-flight, mfi-common: create live migration test for libvirt
2015-07-22 10:13 [PATCH OSSTEST v3 00/13] Libvirt migration and HVM tests Wei Liu
` (11 preceding siblings ...)
2015-07-22 10:13 ` [PATCH OSSTEST v3 12/13] make-flight, mfi-common: rename onetoolstack to pairtoolstack Wei Liu
@ 2015-07-22 10:13 ` Wei Liu
12 siblings, 0 replies; 24+ messages in thread
From: Wei Liu @ 2015-07-22 10:13 UTC (permalink / raw)
To: Xen-devel; +Cc: ian.jackson, Wei Liu, ian.campbell
Note that we start testing libvirt migration for 4.4 and above.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
See #0 for runvars diff
---
make-flight | 13 +++++++++++--
mfi-common | 4 +++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/make-flight b/make-flight
index dde85c9..3de9151 100755
--- a/make-flight
+++ b/make-flight
@@ -465,11 +465,20 @@ test_matrix_do_one () {
done # qemuu_suffix
# Test live migration
- job_create_test test-$xenarch$kern-$dom0arch-pair test-pair \
- $pairtoolstack $xenarch $dom0arch \
+ for toolstack in $pairtoolstack; do
+ # Don't change test case name for old test cases with xl and xend
+ if [ x$toolstack = xxl -o x$toolstack = xxend ]; then
+ toolstack_suffix=""
+ else
+ toolstack_suffix="-$toolstack"
+ fi
+ job_create_test test-$xenarch$kern-$dom0arch$toolstack_suffix-pair \
+ test-pair \
+ $toolstack $xenarch $dom0arch \
!host !host_hostflags \
$debian_runvars \
all_hostflags=$most_hostflags,equiv-1
+ done
if [ x$test_pvh = xy -a $xenarch = amd64 -a $dom0arch = amd64 ]; then
diff --git a/mfi-common b/mfi-common
index e517019..0e2e084 100644
--- a/mfi-common
+++ b/mfi-common
@@ -316,7 +316,9 @@ test_matrix_iterate () {
xen-3.*-testing) pairtoolstack=xend ;;
xen-4.0-testing) pairtoolstack=xend ;;
xen-4.1-testing) pairtoolstack=xend ;;
- *) pairtoolstack=xl ;;
+ xen-4.2-testing) pairtoolstack=xl ;;
+ xen-4.3-testing) pairtoolstack=xl ;;
+ *) pairtoolstack="xl libvirt" ;;
esac
for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
--
1.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread