Attachment 907228 Details for Bug 1105486 – storage test patch to allow planning of FCoE

[patch] storage test patch to allow planning of FCoE

storage.patch (text/plain), 1.87 KB, created by Greg Nichols on 2014-06-10 12:43:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2014-06-10 12:43:34 UTC

Size: 1.87 KB

patch

obsolete

>diff --git a/tests/storage/storage.py b/tests/storage/storage.py
>index be14c9a..ed61daa 100644
>--- a/tests/storage/storage.py
>+++ b/tests/storage/storage.py
>@@ -72,24 +72,21 @@ class StorageTest(Test):
>         devices = deviceDetector.getDevices()
>         hostPattern = re.compile("\/(?P<host>(host|css|cciss|hspa)[0-9]+)\/")
>         for device in devices:
>-            disk = None
>             # find disks that are not either partitions or virtual block devices
>             if ((device.getProperty("ID_TYPE") and device.getProperty("ID_TYPE") == "disk" or
>-                not device.getProperty("ID_TYPE") and device.getProperty("DEVTYPE") == "disk") and
>-                not "/devices/virtual" in device.getProperty("DEVPATH")):
>+                not device.getProperty("ID_TYPE") and device.getProperty("DEVTYPE") == "disk")):
> 
>                 match = hostPattern.search(device.getProperty("DEVPATH"))
>-                if not match:
>-                    print "Warning: could not determine host for disk %s (%s)" % (device.getProperty("DEVNAME"), device.getProperty("DEVPATH"))
>-                    host = "unknown"
>-                else:
>+                if match:
>                     host = match.group("host")
> 
>-                if not host in disks:
>-                    if self.debug != Constants.off:
>-                        print "    Found host bus adapter: %s" % host
>-                    disks[host] = list()
>-                disks[host].append(device)
>+                    if not host in disks:
>+                        if self.debug != Constants.off:
>+                            print "    Found host bus adapter: %s" % host
>+                        disks[host] = list()
>+                    disks[host].append(device)
>+                elif self.debug == Constants.high:
>+                    print "Couldn't find host for disk %s" % device.getProperty("DEVPATH")
> 
>         return disks
>

Actions: View | Diff

Attachments on bug 1105486: 902823 | 902824 | 907228 | 907791 | 907792