This will allow us to more easily have per-toolstack methods etc.
The previous hash of toolstack parameters is now a blessed object. For
now the callers don't need to change but over the following patches we
will refactor things to use method calls. In particular we will be
aiming to remove Command from the hash and use method calls for
everything.
Signed-off-by: Ian Campbell <ian.campb...@citrix.com>
---
Osstest/TestSupport.pm | 37 ++++---------------------------------
Osstest/Toolstack/libvirt.pm | 34 ++++++++++++++++++++++++++++++++++
Osstest/Toolstack/xend.pm | 35 +++++++++++++++++++++++++++++++++++
Osstest/Toolstack/xl.pm | 35 +++++++++++++++++++++++++++++++++++
4 files changed, 108 insertions(+), 33 deletions(-)
create mode 100644 Osstest/Toolstack/libvirt.pm
create mode 100644 Osstest/Toolstack/xend.pm
create mode 100644 Osstest/Toolstack/xl.pm
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index b7887bc..df05d8a 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1862,42 +1862,13 @@ sub guest_vncsnapshot_stash ($$$$) {
target_getfile_root($ho,100, "$rfile", "$stash/$leaf");
}
-our %toolstacks=
- ('xend' => {
- NewDaemons => [qw(xend)],
- OldDaemonInitd => 'xend',
- Command => 'xm',
- CfgPathVar => 'cfgpath',
- Dom0MemFixed => 1,
- },
- 'xl' => {
- NewDaemons => [],
- Dom0MemFixed => 1,
- Command => 'xl',
- CfgPathVar => 'cfgpath',
- RestoreNeedsConfig => 1,
- },
- 'libvirt' => {
- NewDaemons => [qw(libvirtd)],
- Dom0MemFixed => 1,
- Command => 'virsh',
- ExtraPackages => [qw(libnl1 libavahi-client3)],
- },
- );
-
sub toolstack ($) {
my ($ho) = @_;
return $ho->{Toolstack} if $ho->{Toolstack};
- my $tsname= $r{toolstack};
- $tsname= 'xend' if !defined $tsname;
- my $ts= $toolstacks{$tsname};
- die "$tsname ?" unless defined $ts;
- if (!exists $ts->{Name}) {
- logm("toolstack $tsname");
- $ts->{Name}= $tsname;
- }
- $ho->{Toolstack} = $ts;
- return $ts;
+
+ my $tsname= $r{toolstack} || 'xend';
+ $ho->{Toolstack}= get_host_method_object($ho, 'Toolstack', $tsname);
+ return $ho->{Toolstack};
}
sub authorized_keys () {
diff --git a/Osstest/Toolstack/libvirt.pm b/Osstest/Toolstack/libvirt.pm
new file mode 100644
index 0000000..90fe434
--- /dev/null
+++ b/Osstest/Toolstack/libvirt.pm
@@ -0,0 +1,34 @@
+# This is part of "osstest", an automated testing framework for Xen.
+# Copyright (C) 2014 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/>.
+
+
+package Osstest::Toolstack::libvirt;
+
+use strict;
+use warnings;
+
+sub new {
+ my ($class, $ho, $methname,$asset) = @_;
+ return bless { Name => "libvirt",
+ Host => $ho,
+ NewDaemons => [qw(libvirtd)],
+ Dom0MemFixed => 1,
+ Command => 'virsh',
+ ExtraPackages => [qw(libnl1 libavahi-client3)],
+ }, $class;
+}
+
+1;
diff --git a/Osstest/Toolstack/xend.pm b/Osstest/Toolstack/xend.pm
new file mode 100644
index 0000000..881417d
--- /dev/null
+++ b/Osstest/Toolstack/xend.pm
@@ -0,0 +1,35 @@
+# This is part of "osstest", an automated testing framework for Xen.
+# Copyright (C) 2014 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/>.
+
+
+package Osstest::Toolstack::xend;
+
+use strict;
+use warnings;
+
+sub new {
+ my ($class, $ho, $methname,$asset) = @_;
+ return bless { Name => "xend",
+ Host => $ho,
+ NewDaemons => [qw(xend)],
+ OldDaemonInitd => 'xend',
+ Command => 'xm',
+ CfgPathVar => 'cfgpath',
+ Dom0MemFixed => 1,
+ }, $class;
+}
+
+1;
diff --git a/Osstest/Toolstack/xl.pm b/Osstest/Toolstack/xl.pm
new file mode 100644
index 0000000..0b66201
--- /dev/null
+++ b/Osstest/Toolstack/xl.pm
@@ -0,0 +1,35 @@
+# This is part of "osstest", an automated testing framework for Xen.
+# Copyright (C) 2014 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/>.
+
+
+package Osstest::Toolstack::xl;
+
+use strict;
+use warnings;
+
+sub new {
+ my ($class, $ho, $methname,$asset) = @_;
+ return bless { Name => "xl",
+ Host => $ho,
+ NewDaemons => [],
+ Dom0MemFixed => 1,
+ Command => 'xl',
+ CfgPathVar => 'cfgpath',
+ RestoreNeedsConfig => 1,
+ }, $class;
+}
+
+1;
--
2.1.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
