Changeset 65226 in vbox for trunk/src/VBox/ValidationKit/testmanager/core/testbox.py

Timestamp:

Jan 10, 2017 3:36:36 PM (8 years ago)

Author:

vboxsync

Message:

TestManager: Hacked up some basic testbox sorting during the weekly meeting.

File:

• trunk/src/VBox/ValidationKit/testmanager/core/testbox.py (modified) (5 diffs)

trunk/src/VBox/ValidationKit/testmanager/core/testbox.py

@@ -671 +671 @@
     """
 
+    kiSortColumn_sName              =  0;
+    kiSortColumn_sOs                =  1;
+    kiSortColumn_sOsVersion         =  2;
+    kiSortColumn_sCpuVendor         =  3;
+    kiSortColumn_sCpuArch           =  4;
+    kiSortColumn_lCpuRevision       =  5;
+    kiSortColumn_cCpus              =  6;
+    kiSortColumn_cMbMemory          =  7;
+    kiSortColumn_cMbScratch         =  8;
+    kiSortColumn_fNestedPaging      =  9;
+    kiSortColumn_iTestBoxScriptRev  = 10;
+    kiSortColumn_iPythonHexVersion  = 11;
+    kcMaxSortColumns                = 12;
+    kdSortColumnMap                 = {
+        kiSortColumn_sName:             'TestBoxesWithStrings.sName',
+        kiSortColumn_sOs:               'TestBoxesWithStrings.sOs',
+        kiSortColumn_sOsVersion:        'TestBoxesWithStrings.sOsVersion',
+        kiSortColumn_sCpuVendor:        'TestBoxesWithStrings.sCpuVendor',
+        kiSortColumn_sCpuArch:          'TestBoxesWithStrings.sCpuArch',
+        kiSortColumn_lCpuRevision:      'TestBoxesWithStrings.lCpuRevision',
+        kiSortColumn_cCpus:             'TestBoxesWithStrings.cCpus',
+        kiSortColumn_cMbMemory:         'TestBoxesWithStrings.cMbMemory',
+        kiSortColumn_cMbScratch:        'TestBoxesWithStrings.cMbScratch',
+        kiSortColumn_fNestedPaging:     'TestBoxesWithStrings.fNestedPaging',
+        kiSortColumn_iTestBoxScriptRev: 'TestBoxesWithStrings.iTestBoxScriptRev',
+        kiSortColumn_iPythonHexVersion: 'TestBoxesWithStrings.iPythonHexVersion',
+    };
 
     def __init__(self, oDb):
@@ -694 +721 @@
         return oData;
 
-    def fetchForListing(self, iStart, cMaxRows, tsNow):
+    def fetchForListing(self, iStart, cMaxRows, tsNow, aiSortColumns = None):
         """
         Fetches testboxes for listing.
@@ -713 +740 @@
 
         from testmanager.core.testboxstatus import TestBoxStatusData;
+
+        if aiSortColumns is None or len(aiSortColumns) == 0:
+            aiSortColumns = [self.kiSortColumn_sName,];
 
         if tsNow is None:
@@ -721 +751 @@
                               '                      ON TestBoxStatuses.idTestBox = TestBoxesWithStrings.idTestBox\n'
                               'WHERE    TestBoxesWithStrings.tsExpire = \'infinity\'::TIMESTAMP\n'
-                              'ORDER BY TestBoxesWithStrings.sName\n'
+                              'ORDER BY ' + (', '.join([self.kdSortColumnMap[i] for i in aiSortColumns])) + '\n'
                               'LIMIT %s OFFSET %s\n'
                               , (cMaxRows, iStart,));
@@ -732 +762 @@
                               'WHERE    tsExpire     > %s\n'
                               '     AND tsEffective <= %s\n'
-                              'ORDER BY TestBoxesWithStrings.sName\n'
+                              'ORDER BY ' + (', '.join([self.kdSortColumnMap[i] for i in aiSortColumns])) + '\n'
                               'LIMIT %s OFFSET %s\n'
                               , ( tsNow, tsNow, cMaxRows, iStart,));