wip reorg fixes

diff --git a/Osstest.pm b/Osstest.pm
index fc9633a96227a60f2046383631743de2077ef26c..146e9f7b6d2755e8cc1eb883d55ecc00ab5d6aa4 100644 (file)
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -47,7 +47,7 @@ our %c = qw(
     DebianMirrorSubpath debian
 
     TestHostKeypairPath id_rsa_osstest
-    HostProp_GenEtherBase 5e:36:0e:f5:95:9c
+    HostProp_GenEtherPrefixBase 5e:36:0e:f5
 
     HostDiskBoot   300
     HostDiskRoot 10000

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 4ef70cac6c31c55df633db41181a9805390a5086..c29dc451b5d55f5fba28fbd3fa39b2f0529e5b8b 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1075,7 +1075,7 @@ sub select_ether ($$) {
     return $ether if defined $ether;
 
     db_retry($flight,'running', $dbh_tests,[qw(flights)], sub {
-       my $prefix = get_host_property($ho, 'gen-ether-base');
+       my $prefix = get_host_property($ho, 'gen-ether-prefix-base');
        $prefix =~ m/^(\w+:\w+):(\w+):(\w+)$/ or die "$prefix ?";
        my $lhs = $1;
        my $pv = (hex($1)<<8) | (hex($2));

diff --git a/ts-logs-capture b/ts-logs-capture
index be0f07c2305d4ba472092af663bfa3366580019b..51f0c1a06a3d02413ad07899e4a5b0b71aad668f 100755 (executable)
--- a/ts-logs-capture
+++ b/ts-logs-capture
@@ -276,11 +276,11 @@ sub fetch_logs_host_guests () {
         }
 
     my $sth= $dbh_tests->prepare(<<END);
-        SELECT name FROM runvars WHERE flight=$flight AND job='$job'
+        SELECT name FROM runvars WHERE flight=? AND job=?
             AND name LIKE '%_domname'
             ORDER BY name
 END
-    $sth->execute();
+    $sth->execute($flight, $job);
     my $row;
     while ($row= $sth->fetchrow_hashref) {
         my $gn= $row->{name};