This saves repeating identical HostProp and HostFlags for sets of identical
machines. e.g.
HostGroupProp_cubietruck_LinuxSerialConsole ttyS0
HostGroupProp_cubietruck_Build_Make_Flags -j12
HostGroupProp_cubietruck_XenSerialConsole dtuart
HostGroupProp_cubietruck_XenDTUARTPath /soc@01c00000/serial@01c28000
HostGroupFlags_cubietruck
suite-wheezy,equiv-cubietruck,need-kernel-deb-armmp,no-di-kernel,need-uboot-bootscr
HostGroup_braque cubietruck
HostProp_braque_Fqdn braque.uk.xensource.com
HostGroup_picaso cubietruck
HostProp_picaso_Fqdn picaso.uk.xensource.com
HostGroup_metzinger cubietruck
HostProp_metzinger metzinger.uk.xensource.com
HostGroup_gleizes cubietruck
HostProp_gleizes_Fqdn gleizes.uk.xensource.com
Signed-off-by: Ian Campbell <[email protected]>
---
v3: Simplify lookup of HostGroup_FOO
v2: Set HostGroup props after DB
Clarify docs
---
Osstest/HostDB/Static.pm | 2 ++
Osstest/TestSupport.pm | 17 ++++++++++++++++-
README | 22 ++++++++++++++++++++++
3 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/Osstest/HostDB/Static.pm b/Osstest/HostDB/Static.pm
index d0c13a1..ad18395 100644
--- a/Osstest/HostDB/Static.pm
+++ b/Osstest/HostDB/Static.pm
@@ -58,6 +58,8 @@ sub get_flags ($$) { #method
};
$process->('HostFlags');
+ $process->("HostGroupFlags_$ho->{Properties}{HostGroup}")
+ if $ho->{Properties}{HostGroup};
$process->("HostFlags_$ho->{Name}");
return $flags;
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 46b6720..a3b6936 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -767,7 +767,13 @@ sub selecthost ($) {
$ho->{Properties}{$pn} = $val;
};
- # First, we use the config file's general properites as defaults
+ # First, set the prop group if any.
+ if ( $c{"HostGroup_${name}"} ) {
+ $setprop->("HostGroup", $c{"HostGroup_${name}"});
+ logm("Host $name is in HostGroup $ho->{Properties}{HostGroup}");
+ }
+
+ # Next, we use the config file's general properites as defaults
foreach my $k (keys %c) {
next unless $k =~ m/^HostProp_([A-Z].*)$/;
$setprop->($1, $c{$k});
@@ -776,6 +782,15 @@ sub selecthost ($) {
# Then we read in the HostDB's properties
$mhostdb->get_properties($name, $ho->{Properties});
+ # Next, we set any HostGroup based properties
+ if ( $ho->{Properties}{HostGroup} ) {
+ foreach my $k (keys %c) {
+ next unless $k =~ m/^HostGroupProp_([-a-z0-9]+)_(.*)$/;
+ next unless $1 eq $ho->{Properties}{HostGroup};
+ $setprop->($2, $c{$k});
+ }
+ }
+
# Finally, we override any host-specific properties from the config
foreach my $k (keys %c) {
next unless $k =~ m/^HostProp_([-a-z0-9]+)_(.*)$/;
diff --git a/README b/README
index 9a85549..1226369 100644
--- a/README
+++ b/README
@@ -333,6 +333,28 @@ HostProp_<testbox>_TftpScope
Defines the Tftp scope (i.e. subnet) where this host resides. See
"TftpFoo_<scope> and TftpFoo" below.
+HostFlags_<testbox>
+ Defines a set of flags for the host. Flags is a list separated by
+ whitespace, comma or semi-colon. A flag can be unset by prepending
+ a !. Only used in standalone mode.
+
+HostGroup_<testbox> <group>
+ Defines a group of similar hosts of which <testbox> is a
+ member. This can then be used with HostGroupProp and HostGroupFlags
+
+HostGroupProps_<group>_<prop>
+ Equivalent to writing HostProp_<testbox>_<prop> for every testbox
+ which declares HostGroup_<testbox>_<group>. Allows setting a set of
+ common properties for a group of similar machines. These settings
+ take precedence over the database provided settings, but are
+ themselves overridden by host-specific properties.
+
+HostGroupFlags_<group>
+ Equivalent to writing HostFlags_<testbox> for every testbox which
+ declares HostGroup_<testbox>_<group>. Allows setting a set of
+ common flags for a group of similar machines. These flags are
+ merged with the host specific flags. Only used in standalone mode.
+
DebianPreseed
Text to add to the debian-installer preseed file. Optional
but you will need to set some NTP servers here if your firewall
--
2.1.1
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
