> -----Original Message----- > From: xen-devel-boun...@lists.xen.org > [mailto:xen-devel-boun...@lists.xen.org] On Behalf Of Hu, Robert > Sent: Wednesday, August 5, 2015 2:22 PM > To: ian.jack...@eu.citrix.com; Ian Campbell; wei.l...@citrix.com > Cc: xen-devel@lists.xen.org > Subject: [Xen-devel] OSSTEST -- nested test case development, RFC: > ts-guest-destroy doesn't call guest_await_dhcp_tcp() if guest has fixed IP > > Hi Ians, > > Current ts-guest-destory will invoke guest_await_dhcp_tcp(); > but in nested case, after l1 turns into Xen environment, it then has > fixed IP address; which in turn has failed at dhcp lease check. > > So, how about if I in ts-guest-destroy bypass guest_await_dhcp_tcp() > if we have $r{guest->Guest_ip}? Detailed diff
@@ -1354,6 +1355,8 @@ sub selectguest ($$) { $gho->{Options}{$opt}++; } logm("guest: using $gn on $gho->{Host}{Name}"); + $gho->{Ip} = $r{"$gho->{Guest}_ip"}; + logm("guest: $gn has fixed IP $gho->{Ip}"); guest_find_lv($gho); guest_find_ether($gho); guest_find_tcpcheckport($gho); @@ -1758,7 +1761,7 @@ sub guest_await_dhcp_tcp ($$) { " $gho->{TcpCheckPort}". " link/ip/tcp", sub { - my $err= guest_check_ip($gho); + my $err= guest_check_ip($gho) if !$gho->{Ip}; return $err if defined $err; return > > Best Regards, > Robert Ho > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel