Attachment 614405 Details for Bug 858734 – storage test patch to use udev for test planning (device detection)

[patch] storage test patch to use udev for test planning (device detection)

storage.patch (text/plain), 2.12 KB, created by Greg Nichols on 2012-09-19 14:24:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2012-09-19 14:24:42 UTC

Size: 2.12 KB

patch

obsolete

>Index: storage.py
>===================================================================
>--- storage.py	(revision 1374)
>+++ storage.py	(working copy)
>@@ -15,7 +15,7 @@
> # Author: Greg Nichols
> #         YangKun <ykun@redhat.com>
> #
>-import types
>+import types, re
> import os
> import string
> import commands
>@@ -47,6 +47,7 @@
>         tests = dict()
>         self.controllers = ''
>         self.planUDisks(planner, tests)
>+        # self.planUDev(planner, tests)
>         return tests.values()
>     
>     def planUDisks(self, planner, tests):
>@@ -64,6 +65,33 @@
>                 test.setDevice(device)
>                 test.setLogicalDeviceName(disk)
>                 tests[disk] = test
>+                
>+    def planUDev(self, planner, tests):
>+        devices = planner.getUdevDeviceDetector().getDevices()
>+        self.controllers = list()
>+        hostPattern = re.compile("\/(?P<host>host[0-9])\/")
>+        for device in devices:
>+            disk = None
>+            # find disks that aren't partition
>+            if device.getProperty("ID_TYPE") == "disk" and not device.getProperty("ID_PART_ENTRY_NUMBER"):                                           
>+                    disk =  device.getProperty("DEVNAME")
>+                    # get rid of the "/dev/"
>+                    if '/'in disk:
>+                        disk = disk.split('/')[-1]
>+            if disk and not disk in tests:
>+                match = hostPattern.search(device.getProperty("DEVPATH"))
>+                host = match.group("host")
>+                if match and host not in self.controllers:
>+                    self.controllers.append(host)
>+                    print "found %s on host %s" % (disk, host)
>+                    test = self.makeCopy()
>+                    test.setDevice(device)
>+                    test.setLogicalDeviceName(disk)
>+                    tests[disk] = test
>+                elif match:
>+                    print "Skipping %s as controller %s is already being tested" %(disk, host)
>+                
>+                
> 
>     def doDt(self, minBs, maxBs, size, options):
>         """Helper function: run dt with various block sizes and reasonable defaults."""

Actions: View | Diff

Attachments on bug 858734: 614405