Changeset 60522 in vbox for trunk/src/VBox/ValidationKit/tests

Timestamp:

Apr 15, 2016 2:34:35 PM (9 years ago)

Author:

vboxsync

Message:

ValidationKit/usb: Fixes, basic compliance testing works finally

Location:

trunk/src/VBox/ValidationKit/tests/usb

Files:

• tdUsb1.py (modified) (7 diffs)
• tst-utsgadget.py (modified) (2 diffs)
• usbgadget2.py (modified) (9 diffs)

trunk/src/VBox/ValidationKit/tests/usb/tdUsb1.py

@@ -64 +64 @@
     # and the hardware type.
     kdGadgetParams = {
-        # The following is for local testing and not for the test lab.
-        #'adaris': {
-        #    'Low':   ('beaglebone',),
-        #    'Full':  ('beaglebone',),
-        #    'High':  ('beaglebone',),
-        #    'Super': ('odroidxu3',)
-        #},
         'adaris': {
-            'Low':   ('127.0.0.1', 0),
-            'Full':  ('127.0.0.1', 0),
-            'High':  ('127.0.0.1', 0),
-            'Super': ('127.0.0.1', 0)
+            'Low':   ('usbtest.de.oracle.com', None),
+            'Full':  ('usbtest.de.oracle.com', None),
+            'High':  ('usbtest.de.oracle.com', None),
+            'Super': ('usbtest.de.oracle.com', None)
         },
     };
@@ -105 +98 @@
         self.cUsbReattachCycles    = self.cUsbReattachCyclesDef;
         self.sHostname             = socket.gethostname().lower();
+        self.sGadgetHostnameDef    = 'usbtest.de.oracle.com';
+        self.uGadgetPortDef        = None;
 
     #
@@ -131 +126 @@
         reporter.log('  --usb-reattach-cycles <cycles>');
         reporter.log('      Default: %s' % (self.cUsbReattachCyclesDef));
+        reporter.log('  --hostname: <hostname>');
+        reporter.log('      Default: %s' % (self.sHostname));
+        reporter.log('  --default-gadget-host <hostname>');
+        reporter.log('      Default: %s' % (self.sGadgetHostnameDef));
+        reporter.log('  --default-gadget-port <port>');
+        reporter.log('      Default: %s' % (6042));
         return rc;
 
@@ -196 +197 @@
                 raise base.InvalidOption('The "--usb-reattach-cycles" value "%s" is zero or negative.' \
                     % (self.cUsbReattachCycles,));
+        elif asArgs[iArg] == '--hostname':
+            iArg += 1;
+            if iArg >= len(asArgs): raise base.InvalidOption('The "--hostname" takes a hostname');
+            self.sHostname = asArgs[iArg];
+        elif asArgs[iArg] == '--default-gadget-host':
+            iArg += 1;
+            if iArg >= len(asArgs): raise base.InvalidOption('The "--default-gadget-host" takes a hostname');
+            self.sGadgetHostnameDef = asArgs[iArg];
+        elif asArgs[iArg] == '--default-gadget-port':
+            iArg += 1;
+            if iArg >= len(asArgs): raise base.InvalidOption('The "--default-gadget-port" takes port number');
+            try:    self.uGadgetPortDef = int(asArgs[iArg]);
+            except: raise base.InvalidOption('The "--default-gadget-port" value "%s" is not an integer' \
+                    % (asArgs[iArg],));
+            if self.uGadgetPortDef <= 0:
+                raise base.InvalidOption('The "--default-gadget-port" value "%s" is zero or negative.' \
+                    % (self.uGadgetPortDef,));
         else:
             return vbox.TestDriver.parseOption(self, asArgs, iArg);
@@ -271 +289 @@
     def getGadgetParams(self, sHostname, sSpeed):
         """
-        Returns the gadget hostname and type from the
+        Returns the gadget hostname and port from the
         given hostname the test is running on and device speed we want to test.
         """
@@ -278 +296 @@
             return kdGadgetsConfigured.get(sSpeed);
 
-        return (None, None);
+        return (self.sGadgetHostnameDef, self.uGadgetPortDef);
 
     #
@@ -288 +306 @@
         """
         # Get configured USB test devices from hostname we are running on
-        sGadgetHost, _ = self.getGadgetParams(self.sHostname, sSpeed);
+        sGadgetHost, uGadgetPort = self.getGadgetParams(self.sHostname, sSpeed);
 
         oUsbGadget = usbgadget2.UsbGadget();
         reporter.log('Connecting to UTS: ' + sGadgetHost);
-        fRc = oUsbGadget.connectTo(30 * 1000, sGadgetHost);
+        fRc = oUsbGadget.connectTo(30 * 1000, sGadgetHost, uPort = uGadgetPort);
         if fRc is True:
             reporter.log('Connect succeeded');

trunk/src/VBox/ValidationKit/tests/usb/tst-utsgadget.py

@@ -37 +37 @@
 sys.path.insert(0, '.');
 sys.path.insert(0, '..');
+sys.path.insert(0, '../..');
 import usbgadget2 as usbgadget;
 import testdriver.reporter as reporter
@@ -98 +99 @@
 
     if fStdTests:
+        if oGadget.getUsbIpPort() is not None:
+            rc = True;
+        else:
+            rc = False;
+        print '%s: getUsbIpPort() -> %s' % (boolRes(rc), oGadget.getUsbIpPort());
 
+        rc = oGadget.impersonate(usbgadget.g_ksGadgetImpersonationTest);
+        print '%s: impersonate()' % (boolRes(rc));
+
+        rc = oGadget.disconnectUsb();
+        print '%s: disconnectUsb()' % (boolRes(rc));
+
+        rc = oGadget.connectUsb();
+        print '%s: connectUsb()' % (boolRes(rc));
+
+        rc = oGadget.clearImpersonation();
+        print '%s: clearImpersonation()' % (boolRes(rc));
 
         # Done
         rc = oGadget.disconnectFrom();
-        print '%s: disconnect() -> %s' % (boolRes(rc), rc);
+        print '%s: disconnectFrom() -> %s' % (boolRes(rc), rc);
 
     if g_cFailures != 0:

trunk/src/VBox/ValidationKit/tests/usb/usbgadget2.py

@@ -758 +758 @@
     def taskGadgetDestroy(self, iGadgetId):
         """Destroys the given gadget handle on UTS"""
-        fRc = self.sendMsg("GDGTDTOR", (iGadgetId, ));
+        fRc = self.sendMsg("GDGTDTOR", (iGadgetId, zeroByteArray(12)));
         if fRc is True:
             fRc = self.recvAckLogged("GDGTDTOR");
@@ -765 +765 @@
     def taskGadgetConnect(self, iGadgetId):
         """Connects the given gadget handle on UTS"""
-        fRc = self.sendMsg("GDGTCNCT", (iGadgetId, ));
+        fRc = self.sendMsg("GDGTCNCT", (iGadgetId, zeroByteArray(12)));
         if fRc is True:
             fRc = self.recvAckLogged("GDGTCNCT");
@@ -772 +772 @@
     def taskGadgetDisconnect(self, iGadgetId):
         """Disconnects the given gadget handle from UTS"""
-        fRc = self.sendMsg("GDGTDCNT", (iGadgetId, ));
+        fRc = self.sendMsg("GDGTDCNT", (iGadgetId, zeroByteArray(12)));
         if fRc is True:
             fRc = self.recvAckLogged("GDGTDCNT");
@@ -877 +877 @@
         """
         return self.startTask(cMsTimeout, fIgnoreErrors, "GadgetConnect", self.taskGadgetConnect, \
-                              (long(iGadgetId), ));
+                              (iGadgetId, ));
 
     def syncGadgetConnect(self, iGadgetId, cMsTimeout = 30000, fIgnoreErrors = False):
@@ -892 +892 @@
         """
         return self.startTask(cMsTimeout, fIgnoreErrors, "GadgetDisconnect", self.taskGadgetDisconnect, \
-                              (long(iGadgetId), ));
+                              (iGadgetId, ));
 
     def syncGadgetDisconnect(self, iGadgetId, cMsTimeout = 30000, fIgnoreErrors = False):
@@ -1297 +1297 @@
         self.iUsbIpPort     = None;
 
-    def _clearImpersonation(self):
+    def clearImpersonation(self):
         """
         Removes the current impersonation of the gadget.
@@ -1305 +1305 @@
         if self.idGadget is not None:
             fRc = self.oUtsSession.syncGadgetDestroy(self.idGadget);
+            self.idGadget = None;
 
         return fRc;
@@ -1327 +1328 @@
 
         # Clear any previous impersonation
-        self._clearImpersonation();
+        self.clearImpersonation();
         self.sImpersonation = sImpersonation;
 
         fRc = False;
         if sImpersonation == g_ksGadgetImpersonationTest:
-            fRc = self.oUtsSession.syncGadgetCreate(g_kiGadgetTypeTest, g_kiGadgetAccessUsbIp);
+            fDone = self.oUtsSession.syncGadgetCreate(g_kiGadgetTypeTest, g_kiGadgetAccessUsbIp);
+            if fDone is True and self.oUtsSession.isSuccess():
+                # Get the gadget ID.
+                _, _, abPayload = self.oUtsSession.getLastReply();
+
+                fRc = True;
+                self.idGadget = getU32(abPayload, 16);
         else:
             reporter.log('Invalid or unsupported impersonation');
@@ -1388 +1395 @@
         fRc = True;
 
-        self._clearImpersonation();
+        self.clearImpersonation();
         if self.oUtsSession is not None:
             fRc = self.oUtsSession.syncDisconnect();