Changeset 79400 in vbox

Timestamp:

Jun 28, 2019 12:32:57 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131640

Message:

vboxtestvms.py: Array getting fixes. bugref:9320 bugref:9151

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxtestvms.py (modified) (4 diffs)

trunk/src/VBox/ValidationKit/testdriver/vboxtestvms.py

@@ -417 +417 @@
         return True;
 
-    def _storageCtrlAndBusToName(self, oVM, eCtrl, eBus):
+    def _storageCtrlAndBusToName(self, oVBoxMgr, oVM, eCtrl, eBus):
         """
         Resolves the storage controller name given type and bus.
@@ -424 +424 @@
         """
         try:
-            aoControllers = oVM.storageControllers;
+            aoControllers = oVBoxMgr.getArray(oVM, 'storageControllers');
         except:
             reporter.errorXcpt();
@@ -819 +819 @@
                     reporter.errorXcpt();
                 else:
-                    self.__tHddCtrlPortDev = (self._storageCtrlAndBusToName(oVM, eCtrl, eBus), 0, 0); # ASSUMES port 0, device 0.
+                    # ASSUMES port 0, device 0.
+                    self.__tHddCtrlPortDev = (self._storageCtrlAndBusToName(oVBoxWrapped.oVBoxMgr, oVM, eCtrl, eBus), 0, 0);
                     reporter.log2('getHddAddress: %s, %s, %s [IGuestOSType]' % self.__tHddCtrlPortDev);
         return self.__tHddCtrlPortDev;
@@ -864 +865 @@
                     reporter.errorXcpt();
                 else:
-                    self.__tDvdCtrlPortDev = (self._storageCtrlAndBusToName(oVM, eCtrl, eBus), 1, 0); # ASSUMES port 1, device 0.
+                    # ASSUMES port 1, device 0.
+                    self.__tDvdCtrlPortDev = (self._storageCtrlAndBusToName(oVBoxWrapped.oVBoxMgr, oVM, eCtrl, eBus), 1, 0);
                     reporter.log2('getDvdAddress: %s, %s, %s [IGuestOSType]' % self.__tDvdCtrlPortDev);
         return self.__tDvdCtrlPortDev;