wip reorg fixes

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index bc76ac0ead1a55c28d2c133b217ec5953a467a21..30b1fb82f7cbe038723837e2d8937c186509652e 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -11,6 +11,7 @@ use IO::Socket::INET;
 
 use Osstest;
 use Osstest::Logtailer;
+use File::Copy;
 
 BEGIN {
     use Exporter ();
@@ -22,6 +23,7 @@ BEGIN {
                       ts_get_host_guest
 
                       fail broken logm $logm_handle get_filecontents
+                      report_once
 
                       store_runvar get_runvar get_runvar_maybe
                       get_runvar_default need_runvars flight_otherjob
@@ -583,11 +585,11 @@ sub poll_loop ($$$&) {
 
 #---------- dhcp watching ----------
 
-sub dhcp_watch_host_setup ($) {
-    my ($ho) = @_;
+sub dhcp_watch_setup ($$) {
+    my ($ho,$gho) = @_;
 
     my $meth = get_host_property($ho,'dhcp-watch-method',undef);
-    $ho->{DhcpWatch} = get_host_method_object($ho, 'DhcpWatch', $meth);
+    $gho->{DhcpWatch} = get_host_method_object($ho, 'DhcpWatch', $meth);
 }
 
 sub guest_check_ip ($) {
@@ -661,7 +663,7 @@ sub selecthost ($) {
 
     $mhostdb->default_methods($ho);
 
-    dhcp_watch_host_setup($ho);
+    dhcp_watch_setup($ho,$ho);
     power_cycle_host_setup($ho);
 
     my $serialmeth = get_host_property($ho,'serial','noop');
@@ -1003,6 +1005,7 @@ sub selectguest ($$) {
     guest_find_lv($gho);
     guest_find_ether($gho);
     guest_find_tcpcheckport($gho);
+    dhcp_watch_setup($ho,$gho);
     return $gho;
 }
 

diff --git a/standalone-config-example b/standalone-config-example
index a5b53a8c99705b4ffcc78bcfc411869da110bfb2..67882d43bad68190345680928c19a0b5325c9dc2 100644 (file)
--- a/standalone-config-example
+++ b/standalone-config-example
@@ -4,7 +4,8 @@ NetNameservers 10.80.248.2 10.80.16.28 10.80.16.67
 TestHost bedbug
 HostProp_bedbug_Ether 00:13:72:14:c0:51
 
-#HostProp_DhcpWatch leases dhcp3 dhcp.uk.xensource.com:5556
+HostProp_DhcpWatchMethod leases dhcp3 woking.cam.xci-test.com:5556
+#HostProp_DhcpWatchMethod leases dhcp3 dhcp.uk.xensource.com:5556
 
 DebianMirrorHost debian.uk.xensource.com