Changeset 83403 in vbox for trunk/src/VBox

Timestamp:

Mar 25, 2020 12:09:58 PM (5 years ago)

Author:

vboxsync

Message:

TestManager/webui: Better/generic testbox links.

Location:

trunk/src/VBox/ValidationKit/testmanager/webui

Files:

• wuiadminschedgroup.py (modified) (2 diffs)
• wuiadmintestbox.py (modified) (2 diffs)
• wuicontentbase.py (modified) (1 diff)
• wuihlpform.py (modified) (2 diffs)
• wuireport.py (modified) (3 diffs)
• wuitestresult.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testmanager/webui/wuiadminschedgroup.py

@@ -37 +37 @@
 from testmanager.core.testbox           import TestBoxData, TestBoxLogic;
 from testmanager.webui.wuicontentbase   import WuiFormContentBase, WuiListContentBase, WuiTmLink, WuiRawHtml;
+from testmanager.webui.wuiadmintestbox  import WuiTestBoxDetailsLink;
 
 
@@ -154 +155 @@
             oTestBox = oRelation.oTestBox;
             if oTestBox:
-                aoTestBoxes.append(WuiTmLink(oTestBox.sName, WuiAdmin.ksScriptName,
-                                             { WuiAdmin.ksParamAction: WuiAdmin.ksActionTestBoxDetails,
-                                               TestBoxData.ksParam_idTestBox: oTestBox.idTestBox,
-                                               WuiAdmin.ksParamEffectiveDate: self._tsEffectiveDate, },
-                                             sTitle = '#%s - %s / %s - %s.%s (%s)'
-                                                    % (oTestBox.idTestBox, oTestBox.ip, oTestBox.uuidSystem, oTestBox.sOs,
-                                                       oTestBox.sCpuArch, oTestBox.sOsVersion,)));
+                aoTestBoxes.append(WuiTestBoxDetailsLink(oTestBox, fBracketed = True, tsNow = self._tsEffectiveDate));
             else:
                 aoTestBoxes.append(WuiRawHtml('#%s' % (oRelation.idTestBox,)));

trunk/src/VBox/ValidationKit/testmanager/webui/wuiadmintestbox.py

@@ -45 +45 @@
 
 
-class WuiTestBoxDetailsLink(WuiTmLink):
+class WuiTestBoxDetailsLinkById(WuiTmLink):
     """  Test box details link by ID. """
 
-    def __init__(self, idTestBox, sName = WuiContentBase.ksShortDetailsLink, fBracketed = False, tsNow = None):
+    def __init__(self, idTestBox, sName = WuiContentBase.ksShortDetailsLink, fBracketed = False, tsNow = None, sTitle = None):
         from testmanager.webui.wuiadmin import WuiAdmin;
         dParams = {
@@ -56 +56 @@
         if tsNow is not None:
             dParams[WuiAdmin.ksParamEffectiveDate] = tsNow; ## ??
-        WuiTmLink.__init__(self, sName, WuiAdmin.ksScriptName, dParams, fBracketed = fBracketed);
+        WuiTmLink.__init__(self, sName, WuiAdmin.ksScriptName, dParams, fBracketed = fBracketed, sTitle = sTitle);
         self.idTestBox = idTestBox;
 
+
+class WuiTestBoxDetailsLink(WuiTestBoxDetailsLinkById):
+    """  Test box details link by TestBoxData instance. """
+
+    def __init__(self, oTestBox, sName = None, fBracketed = False, tsNow = None): # (TestBoxData, str, bool, Any) -> None
+        WuiTestBoxDetailsLinkById.__init__(self, oTestBox.idTestBox,
+                                           sName if sName else oTestBox.sName,
+                                           fBracketed = fBracketed,
+                                           tsNow = tsNow,
+                                           sTitle = self.formatTitleText(oTestBox));
+        self.oTestBox = oTestBox;
+
+    @staticmethod
+    def formatTitleText(oTestBox): # (TestBoxData) -> str
+        """
+        Formats the title text for a TestBoxData object.
+        """
+
+        # Note! Somewhat similar code is found in testresults.py
+
+        #
+        # Collect field/value tuples.
+        #
+        aasTestBoxTitle = [
+            (u'Identifier:',  '#%u' % (oTestBox.idTestBox,),),
+            (u'Name:',        oTestBox.sName,),
+        ];
+        if oTestBox.sCpuVendor:
+            aasTestBoxTitle.append((u'CPU\u00a0vendor:',    oTestBox.sCpuVendor, ));
+        if oTestBox.sCpuName:
+            aasTestBoxTitle.append((u'CPU\u00a0name:',      u'\u00a0'.join(oTestBox.sCpuName.split()),));
+        if oTestBox.cCpus:
+            aasTestBoxTitle.append((u'CPU\u00a0threads:',   u'%s' % ( oTestBox.cCpus, ),));
+
+        asFeatures = [];
+        if oTestBox.fCpuHwVirt       is True:
+            if oTestBox.sCpuVendor is None:
+                asFeatures.append(u'HW\u2011Virt');
+            elif oTestBox.sCpuVendor in ['AuthenticAMD',]:
+                asFeatures.append(u'HW\u2011Virt(AMD\u2011V)');
+            else:
+                asFeatures.append(u'HW\u2011Virt(VT\u2011x)');
+        if oTestBox.fCpuNestedPaging is True: asFeatures.append(u'Nested\u2011Paging');
+        if oTestBox.fCpu64BitGuest   is True: asFeatures.append(u'64\u2011bit\u2011Guest');
+        if oTestBox.fChipsetIoMmu    is True: asFeatures.append(u'I/O\u2011MMU');
+        aasTestBoxTitle.append((u'CPU\u00a0features:',      u',\u00a0'.join(asFeatures),));
+
+        if oTestBox.cMbMemory:
+            aasTestBoxTitle.append((u'System\u00a0RAM:',    u'%s MiB' % ( oTestBox.cMbMemory, ),));
+        if oTestBox.sOs:
+            aasTestBoxTitle.append((u'OS:',                 oTestBox.sOs, ));
+        if oTestBox.sCpuArch:
+            aasTestBoxTitle.append((u'OS\u00a0arch:',       oTestBox.sCpuArch,));
+        if oTestBox.sOsVersion:
+            aasTestBoxTitle.append((u'OS\u00a0version:',    u'\u00a0'.join(oTestBox.sOsVersion.split()),));
+        if oTestBox.ip:
+            aasTestBoxTitle.append((u'IP\u00a0address:',    u'%s' % ( oTestBox.ip, ),));
+
+        #
+        # Do a guestimation of the max field name width and pad short
+        # names when constructing the title text lines.
+        #
+        cchMaxWidth = 0;
+        for sEntry, _ in aasTestBoxTitle:
+            cchMaxWidth = max(WuiTestBoxDetailsLink.estimateStringWidth(sEntry), cchMaxWidth);
+        asTestBoxTitle = [];
+        for sEntry, sValue in aasTestBoxTitle:
+            asTestBoxTitle.append(u'%s%s\t\t%s'
+                                  % (sEntry, WuiTestBoxDetailsLink.getStringWidthPadding(sEntry, cchMaxWidth), sValue));
+
+        return u'\n'.join(asTestBoxTitle);
+
+
+class WuiTestBoxDetailsLinkShort(WuiTestBoxDetailsLink):
+    """  Test box details link by TestBoxData instance, but with ksShortDetailsLink as default name. """
+
+    def __init__(self, oTestBox, sName = WuiContentBase.ksShortDetailsLink, fBracketed = False,
+                 tsNow = None): # (TestBoxData, str, bool, Any) -> None
+        WuiTestBoxDetailsLink.__init__(self, oTestBox, sName = sName, fBracketed = fBracketed, tsNow = tsNow);
 
 

trunk/src/VBox/ValidationKit/testmanager/webui/wuicontentbase.py

@@ -116 +116 @@
             sFmt = '<a %shref="%s">%s</a>';
         return sFmt % (sExtraAttrs, webutils.escapeAttr(self.sUrl), webutils.escapeElem(self.sName));
+
+    @staticmethod
+    def estimateStringWidth(sString):
+        """
+        Takes a string and estimate it's width so the caller can pad with
+        U+2002 before tab in a title text.  This is very very rough.
+        """
+        cchWidth = 0;
+        for ch in sString:
+            if ch.isupper() or ch in u'wm\u2007\u2003\u2001\u3000':
+                cchWidth += 2;
+            else:
+                cchWidth += 1;
+        return cchWidth;
+
+    @staticmethod
+    def getStringWidthPaddingEx(cchWidth, cchMaxWidth):
+        """ Works with estiamteStringWidth(). """
+        if cchWidth + 2 <= cchMaxWidth:
+            return u'\u2002' * ((cchMaxWidth - cchWidth) * 2 // 3)
+        return u'';
+
+    @staticmethod
+    def getStringWidthPadding(sString, cchMaxWidth):
+        """ Works with estiamteStringWidth(). """
+        return WuiLinkBase.getStringWidthPaddingEx(WuiLinkBase.estimateStringWidth(sString), cchMaxWidth);
+
+    @staticmethod
+    def padStringToWidth(sString, cchMaxWidth):
+        """ Works with estimateStringWidth. """
+        cchWidth = WuiLinkBase.estimateStringWidth(sString);
+        if cchWidth < cchMaxWidth:
+            return sString + WuiLinkBase.getStringWidthPaddingEx(cchWidth, cchMaxWidth);
+        return sString;
 
 

trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpform.py

@@ -886 +886 @@
         from testmanager.webui.wuiadmin         import WuiAdmin;
         from testmanager.webui.wuicontentbase   import WuiAdminLink;
+        from testmanager.webui.wuiadmintestbox  import WuiTestBoxDetailsLink;
 
         if not fUseTable:
@@ -927 +928 @@
                               escapeAttr("Priority [0..31].  Higher value means run more often.") ));
 
-                asFeatures = [];
-                if oTestBox.fCpuHwVirt:
-                    asFeatures.append('AMD-V' if oTestBox.sCpuVendor in ['AuthenticAMD',] else 'VT-x');
-                if oTestBox.fCpuNestedPaging:
-                    asFeatures.append('Nested-Paging');
-                if oTestBox.fCpu64BitGuest:
-                    asFeatures.append('64-bit-Guest');
-                if oTestBox.fChipsetIoMmu:
-                    asFeatures.append('IOMMU');
                 self._add(u'    <span class="tmform-testbox-name">%s</span>\n'
-                          % ( WuiAdminLink('%s (%s)' % (oTestBox.sName, oTestBox.sOs),
-                                           WuiAdmin.ksActionTestBoxDetails, fBracketed = False,
-                                           dParams = { oTestBox.ksParam_idGenTestBox: oTestBox.idGenTestBox},
-                                           sTitle = 'CPU:     \t%s\n'
-                                                    'Threads: \t%u - %s\n'
-                                                    'Features:\t%s\n'
-                                                    'RAM:     \t%u MiB\n'
-                                                    'OpSys:   \t%s - %s\n'
-                                                    'Arch:    \t%s\n'
-                                                    'IP-Addr: \t%s\n'
-                                                  % ( ' '.join(oTestBox.sCpuName.split()),
-                                                      oTestBox.cCpus, oTestBox.sCpuVendor,
-                                                      ', '.join(asFeatures),
-                                                      oTestBox.cMbMemory,
-                                                      oTestBox.sOs, oTestBox.sOsVersion,
-                                                      oTestBox.sCpuArch,
-                                                      oTestBox.ip
-                                                      )), ));
+                          % ( WuiTestBoxDetailsLink(oTestBox, sName = '%s (%s)' % (oTestBox.sName, oTestBox.sOs,)),));
                 self._add(u'  </div>\n');
             return self._add(u'        </div></div></div>\n'

trunk/src/VBox/ValidationKit/testmanager/webui/wuireport.py

@@ -36 +36 @@
 from testmanager.webui.wuitestresult    import WuiTestSetLink, WuiTestResultsForTestCaseLink, WuiTestResultsForTestBoxLink;
 from testmanager.webui.wuiadmintestcase import WuiTestCaseDetailsLink;
-from testmanager.webui.wuiadmintestbox  import WuiTestBoxDetailsLink;
+from testmanager.webui.wuiadmintestbox  import WuiTestBoxDetailsLinkShort;
 from testmanager.core.report            import ReportModelBase, ReportFilter;
 from testmanager.core.testresults       import TestResultFilter;
@@ -721 +721 @@
     def _formatEdgeOccurenceSubject(self, oTransient):
         sHtml = u'%s ' % ( webutils.escapeElem(oTransient.oSubject.sName),);
-        sHtml += WuiTestBoxDetailsLink(oTransient.oSubject.idTestBox, fBracketed = False).toHtml();
+        sHtml += WuiTestBoxDetailsLinkShort(oTransient.oSubject).toHtml();
         return sHtml;
 
@@ -732 +732 @@
         sHtml += WuiTestResultsForTestBoxLink(idKey, oTestBox.sName, self._dExtraTestResultsParams).toHtml()
         sHtml += u' ';
-        sHtml += WuiTestBoxDetailsLink(oTestBox.idTestBox).toHtml();
+        sHtml += WuiTestBoxDetailsLinkShort(oTestBox).toHtml();
         sHtml += u' ';
         sHtml += WuiReportSummaryLink(ReportModelBase.ksSubTestBox, oTestBox.idTestBox,

trunk/src/VBox/ValidationKit/testmanager/webui/wuitestresult.py

@@ -886 +886 @@
             sTestBoxTitle += 'OS version:\t%s\n' % ( oEntry.sOsVersion, );
         asFeatures = [];
-        if oEntry.fCpuHwVirt       is True: asFeatures.append(u'HW\u2011Virt');
+        if oEntry.fCpuHwVirt       is True:
+            if oEntry.sCpuVendor is None:
+                asFeatures.append(u'HW\u2011Virt');
+            elif oEntry.sCpuVendor in ['AuthenticAMD',]:
+                asFeatures.append(u'HW\u2011Virt(AMD\u2011V)');
+            else:
+                asFeatures.append(u'HW\u2011Virt(VT\u2011x)');
         if oEntry.fCpuNestedPaging is True: asFeatures.append(u'Nested\u2011Paging');
         if oEntry.fCpu64BitGuest   is True: asFeatures.append(u'64\u2011bit\u2011Guest');