Author: justi9 Date: 2007-10-22 10:40:03 -0400 (Mon, 22 Oct 2007) New Revision: 1131 Modified: mgmt/cumin/python/cumin/model.py mgmt/cumin/python/cumin/queue.py Log: Makes the stats use the stats' list's sorting. Shortens the disk stat names. Modified: mgmt/cumin/python/cumin/model.py =================================================================== --- mgmt/cumin/python/cumin/model.py 2007-10-22 14:28:31 UTC (rev 1130) +++ mgmt/cumin/python/cumin/model.py 2007-10-22 14:40:03 UTC (rev 1131) @@ -371,17 +371,17 @@ # Disk measure = Measurement("diskPageSize", "int") - measure.title = "Disk page size" + measure.title = "Page size" measure.categories = ("disk") self.measurements.append(measure) measure = Measurement("diskPages", "int") - measure.title = "Disk pages" + measure.title = "Pages" measure.categories = ("disk") self.measurements.append(measure) measure = Measurement("diskAvailableSize", "int") - measure.title = "Disk available size" + measure.title = "Available size" measure.categories = ("disk") self.measurements.append(measure) Modified: mgmt/cumin/python/cumin/queue.py =================================================================== --- mgmt/cumin/python/cumin/queue.py 2007-10-22 14:28:31 UTC (rev 1130) +++ mgmt/cumin/python/cumin/queue.py 2007-10-22 14:40:03 UTC (rev 1131) @@ -347,7 +347,7 @@ self.category = category def get_items(self, session, queue): - measures = sorted_by(queue.measurements, "title") + measures = list(queue.measurements) for measure in queue.measurements: if self.category not in measure.categories: