Skip to content

Commit

Permalink
edd: Add absurd_virt tests back in
Browse files Browse the repository at this point in the history 
Signed-off-by: Peter Jones <pjones@redhat.com>
  • Loading branch information
@vathpela
vathpela committed Nov 6, 2015
1 parent 7b41e07 commit 130ac62
Show file tree
Hide file tree
Showing 21 changed files with 173 additions and 0 deletions.
1 change: 1 addition & 0 deletions ..._virt/sys/devices/pci0000:00/0000:00:01.1/ata7/host6/target6:0:0/6:0:0:0/block/sr0/device
View file
@@ -0,0 +1 @@
../../../6:0:0:0
Empty file removed ...urd_virt/sys/devices/pci0000:00/0000:00:01.1/ata7/host6/target6:0:0/6:0:0:0/block/sr0/foo
View file
Empty file.
1 change: 1 addition & 0 deletions ..._virt/sys/devices/pci0000:00/0000:00:01.1/ata7/host6/target6:0:1/6:0:1:0/block/sdb/device
View file
@@ -0,0 +1 @@
../../../6:0:1:0
Empty file removed ...urd_virt/sys/devices/pci0000:00/0000:00:01.1/ata7/host6/target6:0:1/6:0:1:0/block/sdb/foo
View file
Empty file.
Empty file removed ...ibs_test/edd_data/absurd_virt/sys/devices/pci0000:00/0000:00:01.1/ata7/link7/ata_link/foo
View file
Empty file.
1 change: 1 addition & 0 deletions ...edd_data/absurd_virt/sys/devices/pci0000:00/0000:00:01.1/ata7/link7/ata_link/link7/device
View file
@@ -0,0 +1 @@
../../../link7
1 change: 1 addition & 0 deletions ...bsurd_virt/sys/devices/pci0000:00/0000:00:01.1/ata7/link7/dev7.0/ata_device/dev7.0/device
View file
@@ -0,0 +1 @@
../../../dev7.0
Empty file removed ...elibs_test/edd_data/absurd_virt/sys/devices/pci0000:00/0000:00:01.1/ata7/link7/dev7.0/foo
View file
Empty file.
1 change: 1 addition & 0 deletions ...bsurd_virt/sys/devices/pci0000:00/0000:00:01.1/ata7/link7/dev7.1/ata_device/dev7.1/device
View file
@@ -0,0 +1 @@
../../../dev7.1
Empty file removed ...elibs_test/edd_data/absurd_virt/sys/devices/pci0000:00/0000:00:01.1/ata7/link7/dev7.1/foo
View file
Empty file.
1 change: 1 addition & 0 deletions ..._virt/sys/devices/pci0000:00/0000:00:03.0/ata1/host0/target0:0:0/0:0:0:0/block/sda/device
View file
@@ -0,0 +1 @@
../../../0:0:0:0
Empty file removed ...urd_virt/sys/devices/pci0000:00/0000:00:03.0/ata1/host0/target0:0:0/0:0:0:0/block/sda/foo
View file
Empty file.
1 change: 1 addition & 0 deletions ...vices/pci0000:00/0000:00:06.7/usb1/1-1/1-1:1.0/host9/target9:0:0/9:0:0:0/block/sdd/device
View file
@@ -0,0 +1 @@
../../../9:0:0:0/
Empty file removed .../devices/pci0000:00/0000:00:06.7/usb1/1-1/1-1:1.0/host9/target9:0:0/9:0:0:0/block/sdd/foo
View file
Empty file.
1 change: 1 addition & 0 deletions ...bs_test/edd_data/absurd_virt/sys/devices/pci0000:00/0000:00:07.0/virtio1/block/vda/device
View file
@@ -0,0 +1 @@
../../../virtio1
Empty file removed ...elibs_test/edd_data/absurd_virt/sys/devices/pci0000:00/0000:00:07.0/virtio1/block/vda/foo
View file
Empty file.
1 change: 1 addition & 0 deletions ...rd_virt/sys/devices/pci0000:00/0000:00:0a.0/host10/target10:0:1/10:0:1:0/block/sde/device
View file
@@ -0,0 +1 @@
../../../10:0:1:0
Empty file removed ...bsurd_virt/sys/devices/pci0000:00/0000:00:0a.0/host10/target10:0:1/10:0:1:0/block/sde/foo
View file
Empty file.
1 change: 1 addition & 0 deletions ...rt/sys/devices/pci0000:00/0000:00:0b.0/virtio3/host8/target8:0:0/8:0:0:0/block/sdc/device
View file
@@ -0,0 +1 @@
../../../8:0:0:0
Empty file removed ..._virt/sys/devices/pci0000:00/0000:00:0b.0/virtio3/host8/target8:0:0/8:0:0:0/block/sdc/foo
View file
Empty file.
163 changes: 163 additions & 0 deletions tests/devicelibs_test/edd_test.py
View file
Expand Up @@ -199,3 +199,166 @@ def test_get_edd_dict_sata_usb(self):
("edd: interface details: %s", "USB \tserial_number: 30302e31"),
]
self.check_logs(debugs=debugs, infos=infos, warnings=warnings)

def test_collect_edd_data_absurd_virt(self):
self._edd_logger.debug("starting test %s", self._testMethodName)
edd.testdata_log.debug("starting test %s", self._testMethodName)
# siiiigh - this is actually the data out of sysfs on a virt I have
# created. Apparently even qemu claims 3.0 sometimes and gives us
# bad data.
fakeedd = {
0x80: FakeEddEntry(version="0x30", mbr_sig="0x86531966",
sectors=10485760, host_bus="PCI", type="SCSI",
pci_dev="00:07.0", channel=0, scsi_id=0,
scsi_lun=0, interface="SCSI \tid: 0 lun: 0",
sysfspath="/sys/firmware/edd/int13_dev80/"),
0x81: FakeEddEntry(version="0x30", mbr_sig="0x7dfff0db",
sectors=209716, host_bus="PCI", type="ATA",
pci_dev="00:01.1", channel=0,
interface="ATA \tdevice: 1", ata_device=1,
sysfspath="/sys/firmware/edd/int13_dev81/"),
0x82: FakeEddEntry(version="0x30", mbr_sig="0xe3bf124b",
sectors=419432,
sysfspath="/sys/firmware/edd/int13_dev82/"),
0x83: FakeEddEntry(version="0x30", mbr_sig="0xfa0a111d",
sectors=629146,
sysfspath="/sys/firmware/edd/int13_dev83/"),
0x84: FakeEddEntry(version="0x30", mbr_sig="0x63f1d7d8",
sectors=838862, host_bus="PCI", type="SCSI",
pci_dev="00:0b.0", channel=0, scsi_id=0,
scsi_lun=0, interface="SCSI \tid: 0 lun: 0",
sysfspath="/sys/firmware/edd/int13_dev84/"),
0x85: FakeEddEntry(version="0x30", mbr_sig="0xee331b19",
sectors=1258292,
sysfspath="/sys/firmware/edd/int13_dev85/"),
}
edd_dict = edd.collect_edd_data(root=self.root('absurd_virt'))
self.debug('edd_dict: %s', edd_dict)
lib.assertVerboseEqual(len(edd_dict), 6)
lib.assertVerboseEqual(fakeedd[0x80], edd_dict[0x80])
lib.assertVerboseEqual(fakeedd[0x81], edd_dict[0x81])
lib.assertVerboseEqual(fakeedd[0x82], edd_dict[0x82])
lib.assertVerboseEqual(fakeedd[0x83], edd_dict[0x83])
lib.assertVerboseEqual(fakeedd[0x84], edd_dict[0x84])
lib.assertVerboseEqual(fakeedd[0x85], edd_dict[0x85])
debugs = [
("edd: found device 0x%x at %s", 0x80,
'/sys/firmware/edd/int13_dev80/'),
("edd: found device 0x%x at %s", 0x81,
'/sys/firmware/edd/int13_dev81/'),
("edd: found device 0x%x at %s", 0x82,
'/sys/firmware/edd/int13_dev82/'),
("edd: found device 0x%x at %s", 0x83,
'/sys/firmware/edd/int13_dev83/'),
("edd: found device 0x%x at %s", 0x84,
'/sys/firmware/edd/int13_dev84/'),
("edd: found device 0x%x at %s", 0x85,
'/sys/firmware/edd/int13_dev85/'),
]
self.check_logs(debugs=debugs)

def test_get_edd_dict_absurd_virt(self):
self._edd_logger.debug("starting test %s", self._testMethodName)
edd.testdata_log.debug("starting test %s", self._testMethodName)
# siiiigh - this is actually the data out of sysfs on a virt I have
# created. Apparently even qemu claims 3.0 sometimes and gives us
# bad data.
fakeedd = {
0x80: FakeEddEntry(version="0x30", mbr_sig="0x86531966",
sectors=10485760, host_bus="PCI", type="SCSI",
pci_dev="00:07.0", channel=0, scsi_id=0,
scsi_lun=0, interface="SCSI \tid: 0 lun: 0",
sysfspath="/sys/firmware/edd/int13_dev80/",
sysfslink="../devices/pci0000:00/0000:00:07.0/"
"virtio1/block/vda"),
0x81: FakeEddEntry(version="0x30", mbr_sig="0x7dfff0db",
sectors=209716, host_bus="PCI", type="ATA",
pci_dev="00:01.1", channel=0,
interface="ATA \tdevice: 1", ata_device=1,
sysfslink="../devices/pci0000:00/0000:00:01.1/"
"ata7/host6/target6:0:1/6:0:1:0/block/sdb",
sysfspath="/sys/firmware/edd/int13_dev81/"),
0x82: FakeEddEntry(version="0x30", mbr_sig="0xe3bf124b",
sectors=419432,
sysfslink="../devices/pci0000:00/0000:00:03.0/"
"ata1/host0/target0:0:0/0:0:0:0/block/sda",
sysfspath="/sys/firmware/edd/int13_dev82/"),
0x83: FakeEddEntry(version="0x30", mbr_sig="0xfa0a111d",
sectors=629146,
sysfslink="../devices/pci0000:00/0000:00:0a.0/"
"host10/target10:0:1/10:0:1:0/block/sde",
sysfspath="/sys/firmware/edd/int13_dev83/"),
0x84: FakeEddEntry(version="0x30", mbr_sig="0x63f1d7d8",
sectors=838862, host_bus="PCI", type="SCSI",
pci_dev="00:0b.0", channel=0, scsi_id=0,
scsi_lun=0, interface="SCSI \tid: 0 lun: 0",
sysfslink="../devices/pci0000:00/0000:00:0b.0/"
"virtio3/host8/target8:0:0/8:0:0:0/block/sdc",
sysfspath="/sys/firmware/edd/int13_dev84/"),
0x85: FakeEddEntry(version="0x30", mbr_sig="0xee331b19",
sectors=1258292,
sysfslink="../devices/pci0000:00/0000:00:06.7/"
"usb1/1-1/1-1:1.0/host9/target9:0:0/9:0:0:0/"
"block/sdd",
sysfspath="/sys/firmware/edd/int13_dev85/"),
}
devices=(FakeDevice("sda"),
FakeDevice("sdb"),
FakeDevice("sdc"),
FakeDevice("sdd"),
FakeDevice("sde"),
FakeDevice("vda"),
)

edd_dict = edd.get_edd_dict(devices, root=self.root("absurd_virt"))
self.debug('edd_dict: %s', edd_dict)
lib.assertVerboseEqual(len(edd_dict), 6)
# this order is *completely unlike* the order in virt-manager,
# but it does appear to be what EDD is displaying.
lib.assertVerboseEqual(edd_dict["vda"], 0x80)
lib.assertVerboseEqual(edd_dict["sdb"], 0x81)
lib.assertVerboseEqual(edd_dict["sda"], 0x82)
lib.assertVerboseEqual(edd_dict["sde"], 0x83)
lib.assertVerboseEqual(edd_dict["sdc"], 0x84)
lib.assertVerboseEqual(edd_dict["sdd"], 0x85)
debugs = [
("edd: data extracted from 0x%x:%r", 0x80, fakeedd[0x80]),
("edd: data extracted from 0x%x:%r", 0x81, fakeedd[0x81]),
("edd: data extracted from 0x%x:%r", 0x82, fakeedd[0x82]),
("edd: data extracted from 0x%x:%r", 0x83, fakeedd[0x83]),
("edd: data extracted from 0x%x:%r", 0x84, fakeedd[0x84]),
("edd: data extracted from 0x%x:%r", 0x85, fakeedd[0x85]),
("edd: found device 0x%x at %s", 0x80,
'/sys/firmware/edd/int13_dev80/'),
("edd: found device 0x%x at %s", 0x81,
'/sys/firmware/edd/int13_dev81/'),
("edd: found device 0x%x at %s", 0x82,
'/sys/firmware/edd/int13_dev82/'),
("edd: found device 0x%x at %s", 0x83,
'/sys/firmware/edd/int13_dev83/'),
("edd: found device 0x%x at %s", 0x84,
'/sys/firmware/edd/int13_dev84/'),
("edd: found device 0x%x at %s", 0x85,
'/sys/firmware/edd/int13_dev85/'),
]
infos = [
("edd: collected mbr signatures: %s",{ 'vda': '0x86531966',
'sda': '0xe3bf124b',
'sdb': '0x7dfff0db',
'sdc': '0x63f1d7d8',
'sdd': '0xee331b19',
'sde': '0xfa0a111d',
}),
("edd: matched 0x%x to %s using PCI dev", 0x80, "vda"),
("edd: matched 0x%x to %s using PCI dev", 0x81, "sdb"),
("edd: matched 0x%x to %s using MBR sig", 0x82, "sda"),
("edd: matched 0x%x to %s using MBR sig", 0x83, "sde"),
("edd: matched 0x%x to %s using PCI dev", 0x84, "sdc"),
("edd: matched 0x%x to %s using MBR sig", 0x85, "sdd"),
('edd: Could not find Virtio device for pci dev %s channel %s', '00:01.1', 0),
('edd: Could not find Virtio device for pci dev %s channel %s', '00:0b.0', 0),
]
errors = [
('edd: Found too many ATA devices for EDD device 0x%x: %s', 129, ['../devices/pci0000:00/0000:00:01.1/ata7/host6/target6:0:1/6:0:1:0/block/sdb', '../devices/pci0000:00/0000:00:01.1/ata7/host6/target6:0:0/6:0:0:0/block/sr0']),
]
self.check_logs(debugs=debugs, infos=infos, errors=errors)

0 comments on commit 130ac62

Please sign in to comment.