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

Timestamp:

May 29, 2016 7:49:31 PM (9 years ago)

Author:

vboxsync

Message:

virtual test sheriff: Kick-off and the bad-testbox rebooting and disabling. (completely untested)

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• batch/virtual_test_sheriff.py (added)
• core/base.py (modified) (2 diffs)
• core/testbox.py (modified) (5 diffs)
• core/testresults.py (modified) (1 diff)
• core/testset.py (modified) (2 diffs)

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

@@ -89 +89 @@
     """
     Database row is in use and cannot be deleted.
+    Used by ModelLogicBase decendants.
+    """
+    pass;
+
+
+class TMInFligthCollision(TMExceptionBase):
+    """
+    Database update failed because someone else had already made changes to
+    the data there.
     Used by ModelLogicBase decendants.
     """
@@ -1159 +1168 @@
         return self._oDb;
 
+    def _dbRowsToModelDataList(self, oModelDataType, aaoRows = None):
+        """
+        Helper for conerting a simple fetch into a list of ModelDataType python objects.
+
+        If aaoRows is None, we'll fetchAll from the database ourselves.
+
+        The oModelDataType must be a class derived from ModelDataBase and implement
+        the initFormDbRow method.
+
+        Returns a list of oModelDataType instances.
+        """
+        assert issubclass(oModelDataType, ModelDataBase);
+        aoRet = [];
+        if aaoRows is None:
+            aaoRows = self._oDb.fetchAll();
+        for aoRow in aaoRows:
+            aoRet.append(oModelDataType().initFromDbRow(aoRow));
+        return aoRet;
+
+
 
 class AttributeChangeEntry(object): # pylint: disable=R0903

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

@@ -34 +34 @@
 
 # Validation Kit imports.
-from testmanager.core.base  import ModelDataBase, ModelDataBaseTestCase, ModelLogicBase, TMExceptionBase, \
+from testmanager.core.base  import ModelDataBase, ModelDataBaseTestCase, ModelLogicBase, TMExceptionBase, TMInFligthCollision, \
                                    TMInvalidData, TMTooManyRows, TMRowNotFound, ChangeLogEntry, AttributeChangeEntry;
 
@@ -731 +731 @@
         return idGenTestBox;
 
-    def setCommand(self, idTestBox, sOldCommand, sNewCommand, uidAuthor = None, fCommit = False):
+    def setCommand(self, idTestBox, sOldCommand, sNewCommand, uidAuthor = None, fCommit = False, sComment = None,
+                   fNoRollbackOnInFlightCollision = False):
         """
         Sets or resets the pending command on a testbox.
         Returns (idGenTestBox, tsEffective) of the new row.
         """
+        _ = sComment;
         try:
             # Would be easier to do this using an insert or update hook, I think. Much easier.
@@ -745 +747 @@
                               'RETURNING tsExpire\n',
                               (idTestBox, sOldCommand,));
+            if self._oDb.getRowCount() == 0:
+                raise TMInFligthCollision();
             tsEffective = self._oDb.fetchOne()[0];
 
@@ -825 +829 @@
             if fCommit is True:
                 self._oDb.commit();
+
+        except TMInFligthCollision: # This is pretty stupid, but don't want to touch testboxcontroller.py now.
+            if not fNoRollbackOnInFlightCollision:
+                self._oDb.rollback();
+            raise;
         except:
             self._oDb.rollback();
@@ -879 +888 @@
 
 
+    #
+    # The virtual test sheriff interface.
+    #
+
+    def hasTestBoxRecentlyBeenRebooted(self, idTestBox, cHoursBack = 2, tsNow = None):
+        """
+        Checks if the testbox has been rebooted in the specified time period.
+
+        This does not include already pending reboots, though under some
+        circumstances it may.  These being the test box entry being edited for
+        other reasons.
+
+        Returns True / False.
+        """
+        if tsNow is None:
+            tsNow = self._oDb.getCurrentTimestamp();
+        self._oDb.execute('SELECT COUNT(idTestBox)\n'
+                          'FROM   TestBoxes\n'
+                          'WHERE  idTestBox      = %s\n'
+                          '   AND tsExpire       < %s\n'
+                          '   AND tsExpire      >= %s - interval \'%u hours\'\n'
+                          '   AND enmPendingCmd IN (%s, %s)\n'
+                          , ( idTestBox, tsNow, tsNow, cHoursBack,
+                              TestBoxData.ksTestBoxCmd_Reboot, TestBoxData.ksTestBoxCmd_UpgradeAndReboot, ));
+        return self._oDb.fetchOne()[0] > 0;
+
+
+    def rebootTestBox(self, idTestBox, uidAuthor, sComment, sOldCommand = TestBoxData.ksTestBoxCmd_None, fCommit = False):
+        """
+        Issues a reboot command for the given test box.
+        Return True on succes, False on in-flight collision.
+        May raise DB exception with rollback on other trouble.
+        """
+        try:
+            self.setCommand(idTestBox, sOldCommand, TestBoxData.ksTestBoxCmd_Reboot,
+                            uidAuthor = uidAuthor, fCommit = fCommit, sComment = sComment,
+                            fNoRollbackOnInFlightCollision = True);
+        except TMInFligthCollision:
+            return False;
+        except:
+            raise;
+        return True;
+
+
+    def disableTestBox(self, idTestBox, uidAuthor, sComment, fCommit = False):
+        """
+        Disables the given test box.
+
+        Raises exception on trouble, without rollback.
+        """
+        oTestBox = TestBoxData().initFromDbWithId(self._oDb, idTestBox);
+        if oTestBox.fEnabled:
+            oTestBox.fEnabled = False;
+            if sComment is not None:
+                _ = sComment; # oTestBox.sComment = sComment;
+            self.editEntry(oTestBox, uidAuthor = uidAuthor, fCommit = fCommit);
+        return None;
+
+
 #
 # Unit testing.

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

@@ -1857 +1857 @@
 
 
+
+
 #
 # Unit testing.

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

@@ -229 +229 @@
         return oFile;
 
+
+
 class TestSetLogic(ModelLogicBase):
     """
@@ -637 +639 @@
 
 
+    #
+    # The virtual test sheriff interface.
+    #
+
+    def fetchBadTestBoxIds(self, cHoursBack = 2, tsNow = None):
+        """
+        Fetches a list of test box IDs which returned bad-testbox statuses in the
+        given period (tsDone).
+        """
+        if tsNow is None:
+            tsNow = self._oDb.getCurrentTimestamp();
+        self._oDb.execute('SELECT DISTINCT idTestBox\n'
+                          'FROM   TestSets\n'
+                          'WHERE  TestSets.enmStatus = \'bad-testbox\'\n'
+                          '   AND tsDone           <= %s\n'
+                          '   AND tsDone            > (%s - interval \'%s hours\')\n'
+                          , ( tsNow, tsNow, cHoursBack,));
+        return [aoRow[0] for aoRow in self._oDb.fetchAll()];
+
+    def fetchResultForTestBox(self, idTestBox, cHoursBack = 2, tsNow = None):
+        """
+        Fetches the TestSet rows for idTestBox for the given period (tsDone), w/o running ones.
+
+        Returns list of TestSetData sorted by tsDone in descending order.
+        """
+        if tsNow is None:
+            tsNow = self._oDb.getCurrentTimestamp();
+        self._oDb.execute('SELECT *\n'
+                          'FROM   TestSets\n'
+                          'WHERE  TestSets.idTestBox = %s\n'
+                          '   AND tsDone IS NOT NULL\n'
+                          '   AND tsDone           <= %s\n'
+                          '   AND tsDone            > (%s - interval \'%s hours\')\n'
+                          'ORDER by tsDone DESC\n'
+                          , ( idTestBox, tsNow, tsNow, cHoursBack,));
+        return self._dbRowsToModelDataList(TestSetData);
+
+
+
 #
 # Unit testing.