--- SpecReport 2019-01-31 17:33:32.707104764 -0500 +++ ../../../osgstorage-nousable/bin.in/dist_pro/SpecReport 2019-01-31 00:12:57.553502481 -0500 @@ -2,3 +2,3 @@ ############################################################################## -# Copyright (c) 2014 - 2016 Standard Performance Evaluation Corporation +# Copyright (c) 2014 - 2019 Standard Performance Evaluation Corporation # All rights reserved. @@ -9,4 +9,8 @@ # History: -# Date ID, Company Description -# ------- -------------------- -------------------------------------------- +# Date ID, Company Description +# -------- -------------------- ------------------------------------------- +# 01/30/19 nap, iXsystems Remove UsableGiB-related fields,fix +# cropped axes titles on plots, and send +# totalCapacity field to .sub file instead of +# sum of UsableGiB # @@ -1535,3 +1539,3 @@ thissection = Section("Storage and Filesystems") - strgtable = TotalsTable() + strgtable = ItemizedTable() fstable = Table(transpose=True) @@ -1542,3 +1546,3 @@ strg_attribs = ["description", "dataProtection", - "stableStorage", "quantity", "usableGiB"] + "stableStorage", "quantity"] strg_attrib_names = { @@ -1547,4 +1551,3 @@ "stableStorage": "Stable Storage", - "quantity": "Qty", - "usableGiB": "Usable GiB"} + "quantity": "Qty"} fs_attribs = ["fsQuantity", "totalCapacity", "fsType"] @@ -1557,11 +1560,8 @@ strgtable.set_header_align("Qty", "right") - strgtable.set_header_align("Usable GiB", "right") strgtable.set_data_align("Qty", "right") - strgtable.set_data_align("Usable GiB", "right") - strgtable.capacity_col = "Usable GiB" - strgtable.set_col_width(0, 23) - strgtable.set_col_width(1, 12) - strgtable.set_col_width(2, 20) + strgtable.set_col_width(0, 4) + strgtable.set_col_width(1, 37) + strgtable.set_col_width(2, 18) strgtable.set_col_width(3, 8) - strgtable.set_col_width(4, 12) + strgtable.set_col_width(4, 5) for a in fs_attribs: @@ -1589,2 +1589,4 @@ fs_attrib_names[a]) + if a == "totalCapacity": + self.usable_cap = s.attrib[a] else: @@ -1597,3 +1599,2 @@ self.unknown_tag(tag, subtag) - self.usable_cap = strgtable.calculate_total() thissection.add_item(strgtable) @@ -2310,2 +2311,3 @@ matplotlib.rc('font', **font_parms) + rcParams.update({'figure.autolayout': True}) if self.subdir: @@ -3117,2 +3119,3 @@ import matplotlib.pyplot as plt + from matplotlib import rcParams except: