wip reorg wip make Ether optional

diff --git a/Osstest/HostDB/Static.pm b/Osstest/HostDB/Static.pm
index ae333f08f54825bfe7ac8a25e270940e6df260f0..795bacbd50ad4f5a595ae754602d018049721751 100644 (file)
--- 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 a269a308001259ec0e96db8dc03deb0e8655f483..598c20e7e7af21ba7cead0dd8ddaf35ecccd5f46 100644 (file)
--- 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)));