From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 18 Oct 2012 15:13:56 +0000 (+0100)
Subject: wip reorg  wip make Ether optional
X-Git-Tag: wip.xsm-13-actual.base~476^2~89^2~10
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e45c236b3f9b2f1237364e4762b7e2865067e646;p=people%2Fiwj%2Fosstest.git

wip reorg  wip make Ether optional
---

diff --git a/Osstest/HostDB/Static.pm b/Osstest/HostDB/Static.pm
index ae333f08..795bacbd 100644
--- a/Osstest/HostDB/Static.pm
+++ b/Osstest/HostDB/Static.pm
@@ -50,7 +50,6 @@ sub get_flags ($$) { #method
 sub default_methods ($$) { #method
     my ($hd, $ho) = @_;
 
-    die "need ethernet address for $ho->{Name}" unless $ho->{Ether};
     $ho->{Power} ||= "manual $ho->{Name}";
 }
 
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index a269a308..598c20e7 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -705,7 +705,9 @@ sub selecthost ($) {
 
     $mjobdb->host_check_allocated($ho);
 
-    logm("host: selected $ho->{Name} $ho->{Ether} $ho->{Ip}".
+    logm("host: selected $ho->{Name} ".
+	 (defined $ho->{Ether} ? $ho->{Ether} : '<unknown-ether>').
+	 " $ho->{Ip}".
          (!$ho->{Shared} ? '' :
           sprintf(" - shared %s %s %d", $ho->{Shared}{Type},
                   $ho->{Shared}{State}, $ho->{Shared}{Others}+1)));