Revert "[autotest] Merge DUT repair recommendations with board inventory."
This reverts commit 6e9a6b487dc921d9ee6cdc1d13bdf534d70c6680.
This won't do what I meant:
* It breaks the current cron job, because it deletes an option that's
still in use.
* It includes repair recommendations unconditionally, but really,
we only want them first thing in the morning.
Change-Id: I8a095be5cbeb3656f47af799a89ac01a6ff1438b
Reviewed-on: https://chromium-review.googlesource.com/276462
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
diff --git a/site_utils/lab_inventory.py b/site_utils/lab_inventory.py
index 470f7ac..97944a7 100755
--- a/site_utils/lab_inventory.py
+++ b/site_utils/lab_inventory.py
@@ -628,8 +628,7 @@
if recommendation is None or lab_score > best_score:
recommendation = lab_slice
best_score = lab_score
- message = ['Repair recommendations:\n',
- '%-30s %-16s %s' % (
+ message = ['%-30s %-16s %s' % (
'Hostname', 'Board', 'Servo instructions')]
for h in recommendation:
servo_name = servo_host.make_servo_hostname(h.host.hostname)
@@ -663,15 +662,15 @@
"""
logging.debug('Creating board inventory')
- message = ['Full board inventory:\n',
- '%-22s %5s %5s %5s %5s %5s' % (
- 'Board', 'Avail', 'Bad', 'Good',
- 'Spare', 'Total')]
+ message = []
+ message.append(
+ '%-20s %5s %5s %5s %5s %5s' % (
+ 'Board', 'Avail', 'Bad', 'Good', 'Spare', 'Total'))
data_list = inventory.get_board_counts()
data_list = sorted(sorted(data_list, key=lambda t: -t[2]),
key=lambda t: t[1])
message.extend(
- ['%-22s %5d %5d %5d %5d %5d' % t for t in data_list])
+ ['%-20s %5d %5d %5d %5d %5d' % t for t in data_list])
return '\n'.join(message)
@@ -841,6 +840,10 @@
default=[], metavar='ADDRESS',
help='Generate pool inventory message, '
'and send it to the given address(es)')
+ parser.add_argument('--recommend-notify', action='append',
+ default=[], metavar='ADDRESS',
+ help='Generate repair recommendations, '
+ 'and send it to the given address(es)')
parser.add_argument('-r', '--recommend', type=int,
default=_DEFAULT_NUM_RECOMMEND,
help=('Specify how many DUTs should be '
@@ -948,6 +951,8 @@
timestamp = time.strftime('%Y-%m-%d.%H',
time.localtime(end_time))
logging.debug('Starting lab inventory for %s', timestamp)
+ if arguments.recommend_notify:
+ logging.debug('Will include repair recommendations')
if arguments.board_notify:
logging.debug('Will include board inventory')
if arguments.pool_notify:
@@ -963,18 +968,21 @@
if arguments.print_:
_populate_board_counts(inventory)
- if arguments.print_ or arguments.board_notify:
+ if arguments.print_ or arguments.recommend_notify:
recommend_message = _generate_repair_recommendation(
inventory, arguments.recommend)
- board_message = _generate_board_inventory_message(
- inventory)
- full_message = (recommend_message + '\n\n\n' +
- board_message)
+ _send_email(arguments,
+ 'recommend-%s.txt' % timestamp,
+ 'DUT repair recommendations %s' % timestamp,
+ arguments.recommend_notify,
+ recommend_message)
+
+ if arguments.print_ or arguments.board_notify:
_send_email(arguments,
'boards-%s.txt' % timestamp,
'DUT board inventory %s' % timestamp,
arguments.board_notify,
- full_message)
+ _generate_board_inventory_message(inventory))
if arguments.print_ or arguments.pool_notify:
_send_email(arguments,