Changeset 61507 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jun 6, 2016 8:03:45 PM (9 years ago)

Author:

vboxsync

Message:

testmanager: Testboxes can now be members of more than one scheduling group.

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• core/testboxstatus.py (modified) (3 diffs)
• db/TestManagerDatabaseInit.pgsql (modified) (5 diffs)
• db/tmdb-r22-testboxes-3-teststatus-4-testboxinschedgroups-1.pgsql (added)

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

@@ -166 +166 @@
         """
         self._oDb.execute('SELECT   TestBoxStatuses.*,\n'
-                          '         TestBoxesWithStrings.*,\n'
+                          '         TestBoxesWithStrings.*\n'
                           'FROM     TestBoxStatuses,\n'
                           '         TestBoxesWithStrings\n'
@@ -174 +174 @@
                           '     AND TestBoxesWithStrings.uuidSystem = %s\n'
                           '     AND TestBoxesWithStrings.ip         = %s\n'
-                          , (idTestBox,
-                             idTestBox,
-                             sTestBoxUuid,
-                             sTestBoxAddr,
-                          ));
+                          , ( idTestBox,
+                              idTestBox,
+                              sTestBoxUuid,
+                              sTestBoxAddr,) );
         cRows = self._oDb.getRowCount();
         if cRows != 1:
@@ -202 +201 @@
                           '         %s,\n'
                           '         \'idle\'::TestBoxState_T,\n'
-                          '         NULL,\n',
-                          '         0)\n',
-                          (idTestBox, idGenTestBox) );
+                          '         NULL,\n'
+                          '         0)\n'
+                          , (idTestBox, idGenTestBox) );
         self._oDb.maybeCommit(fCommit);
         return True;

trunk/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseInit.pgsql

@@ -550 +550 @@
     --- Test case scheduling priority.
     -- Higher number causes the test case to be run more frequently.
-    -- @sa SchedGroupMembers.iSchedPriority
+    -- @sa SchedGroupMembers.iSchedPriority, TestBoxesInSchedGroups.iSchedPriority
     -- @todo Not sure we want to keep this...
     iSchedPriority      INTEGER     DEFAULT 16  CHECK (iSchedPriority >= 0 AND iSchedPriority < 32)  NOT NULL,
@@ -666 +666 @@
     uidAuthor           INTEGER     NOT NULL,
 
-    --- The scheduling priority if the test group.
+    --- The scheduling priority of the test group.
     -- Higher number causes the test case to be run more frequently.
-    -- @sa TestGroupMembers.iSchedPriority
+    -- @sa TestGroupMembers.iSchedPriority, TestBoxesInSchedGroups.iSchedPriority
     iSchedPriority      INTEGER     DEFAULT 16 CHECK (iSchedPriority >= 0 AND iSchedPriority < 32)  NOT NULL,
     --- When during the week this group is allowed to start running, NULL means
@@ -823 +823 @@
     -- Intended for describing the box as well as making other relevant notes.
     idStrDescription    INTEGER     REFERENCES TestBoxStrTab(idStr)  DEFAULT NULL,
-
-    --- Reference to the scheduling group that this testbox is a member of.
-    -- Non-unique foreign key: SchedGroups(idSchedGroup)
-    -- A testbox is always part of a group, the default one nothing else.
-    idSchedGroup        INTEGER     DEFAULT 1  NOT NULL,
 
     --- Indicates whether this testbox is enabled.
@@ -927 +922 @@
             LEFT OUTER JOIN TestBoxStrTab Str8 ON idStrReport      = Str8.idStr;
 
+
+--- @table TestBoxesInSchedGroups
+-- N:M relationship between test boxes and scheduling groups.
+--
+-- We associate a priority with this relationship.
+--
+-- @remarks This table stores history.  Never update or delete anything.  The
+--          equivalent of deleting is done by setting the 'tsExpire' field to
+--          current_timestamp.  To select the currently valid entries use
+--          tsExpire = TIMESTAMP WITH TIME ZONE 'infinity'.
+--
+CREATE TABLE TestBoxesInSchedGroups (
+    --- TestBox ID.
+    -- Non-unique foreign key: TestBoxes(idTestBox).
+    idTestBox           INTEGER     NOT NULL,
+    --- Scheduling ID.
+    -- Non-unique foreign key: SchedGroups(idSchedGroup).
+    idSchedGroup        INTEGER     NOT NULL,
+    --- When this row starts taking effect (inclusive).
+    tsEffective         TIMESTAMP WITH TIME ZONE  DEFAULT current_timestamp  NOT NULL,
+    --- When this row stops being tsEffective (exclusive).
+    tsExpire            TIMESTAMP WITH TIME ZONE  DEFAULT TIMESTAMP WITH TIME ZONE 'infinity'  NOT NULL,
+    --- The user id of the one who created/modified this entry.
+    -- Non-unique foreign key: Users(uid)
+    uidAuthor           INTEGER     NOT NULL,
+
+    --- The scheduling priority of the scheduling group for the test box.
+    -- Higher number causes the scheduling group to be serviced more frequently.
+    -- @sa TestGroupMembers.iSchedPriority, SchedGroups.iSchedPriority
+    iSchedPriority      INTEGER     DEFAULT 16 CHECK (iSchedPriority >= 0 AND iSchedPriority < 32)  NOT NULL,
+
+    PRIMARY KEY (idTestBox, idSchedGroup, tsExpire)
+);
 
 
@@ -1771 +1799 @@
     enmState            TestBoxState_T DEFAULT 'idle'::TestBoxState_T  NOT NULL,
     --- Reference to the test set
-    idTestSet           INTEGER     REFERENCES TestSets(idTestSet)
+    idTestSet           INTEGER     REFERENCES TestSets(idTestSet),
+    --- Interal work item number.
+    -- This is used to pick and prioritize between multiple scheduling groups.
+    iWorkItem           INTEGER     DEFAULT 0  NOT NULL
 );