From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Mon, 7 Sep 2015 13:00:51 +0000 (+0100)
Subject: Manual allocation: Break out manual_allocation_base_jobinfo from mg-blockage
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2cc1e4d48456b0b00f7d60dcbf9384dd9f8a3b37;p=people%2Fiwj%2Fosstest.git

Manual allocation: Break out manual_allocation_base_jobinfo from mg-blockage

This is called `jobinfo' because it ought to be used in
alloc_resources's JobInfo xparam, rather than an Xinfo in the booking:
JobInfo is per planning client; Xinfo is per individual resource.

mg-blockage currently gets this wrong; we will fix that shortly.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v2: New patch
v3: Fix "joinfo" to "jobinfo".
---

diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm
index 4f51d706..1efcfd47 100644
--- a/Osstest/Executive.pm
+++ b/Osstest/Executive.pm
@@ -51,6 +51,7 @@ BEGIN {
                       report_altchangecolour
                       report_blessingscond report_find_push_age_info
                       tcpconnect_queuedaemon plan_search
+                      manual_allocation_base_jobinfo
                       alloc_resources alloc_resources_rollback_begin_work
                       resource_check_allocated resource_shared_mark_ready
                       duration_estimator
@@ -494,6 +495,12 @@ END
     return $taskid;
 }        
 
+sub manual_allocation_base_jobinfo () {
+    my $whoami = `whoami`; chomp $whoami;
+    my $hostname = `uname -n`; chomp $hostname;
+    return "$whoami\@$hostname";
+}
+
 sub alloc_resources_rollback_begin_work () {
     $dbh_tests->rollback();
     db_begin_work($dbh_tests, \@all_lock_tables);
diff --git a/mg-blockage b/mg-blockage
index 1f66d8e5..0cad6d20 100755
--- a/mg-blockage
+++ b/mg-blockage
@@ -24,9 +24,8 @@ sub parsedate ($) {
     return $r;
 }
 
-my $whoami = `whoami`; chomp $whoami;
-my $hostname = `uname -n`; chomp $hostname;
-my $xinfo = "blockage $whoami\@$hostname [$start .. $end]";
+my $basexinfo = manual_allocation_base_jobinfo();
+my $xinfo = "blockage $basexinfo [$start .. $end]";
 $xinfo .= " $mxinfo" if defined $mxinfo;
 
 $start = parsedate $start;