Update block tests to use xvd rather than SCSI or IDE
cover Update block tests to use xvd rather than SCSI or IDE
Hello All,
This patch Updates all the block specific tests in xm-test to
use the Xen Virtual Block Devices rather than overriding the SCSI or IDE subsystems. It also cleans up some whitespace problems (Which looking back I should have done in a separate patchset).
The last patch (3/3) bumps the version number of xm-test to 1.1, as these new block tests will certainly fail with older initrd's due to the lack of xvd device nodes in the initrd.
I've tested these patches with no regressions on x86, and a number of improvements on PPC.
---
tools/xm-test/configure.ac | 2 tools/xm-test/ramdisk/README-XenSource-initrd-1.1-img | 45 ++++++++++ tools/xm-test/ramdisk/patches/buildroot/add_xvd_devices.patch | 13 ++ tools/xm-test/tests/block-create/01_block_attach_device_pos.py | 10 +- tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py | 8 - tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py | 16 +-- tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py | 18 ++-- tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py | 8 - tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py | 14 +-- tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py | 16 +-- tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py | 44 ++++----- tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py | 30 +++--- tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py | 2 tools/xm-test/tests/block-create/12_block_attach_shared_domU.py | 2 tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py | 8 - tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py | 8 - tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py | 2 tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py | 8 - tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py | 10 +- tools/xm-test/tests/block-integrity/01_block_device_read_verify.py | 4 tools/xm-test/tests/block-integrity/02_block_device_write_verify.py | 4 tools/xm-test/tests/block-list/01_block-list_pos.py | 6 - tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py | 6 - tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py | 10 +- tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py | 24 ++--- 25 files changed, 187 insertions(+), 131 deletions(-)
PATCH 1/3 Update all block tests to use the Xen Virtual Block Device (xvd) rather than IDE or SCSI
Update all block tests to use the Xen Virtual Block Device (xvd) rather than IDE or SCSI.
This patch also modifies 09_block_attach_and_dettach_device_check_data_pos.py to force / to be read-write otherwise the mkdir fails.
Also Whistspace cleanups.
---
tools/xm-test/tests/block-create/01_block_attach_device_pos.py | 10 +- tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py | 8 - tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py | 16 +-- tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py | 18 ++-- tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py | 8 - tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py | 14 +-- tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py | 16 +-- tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py | 44 +++++----- tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py | 30 +++--- tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py | 2 tools/xm-test/tests/block-create/12_block_attach_shared_domU.py | 2 tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py | 8 - tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py | 8 - tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py | 2 tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py | 8 - tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py | 10 +- tools/xm-test/tests/block-integrity/01_block_device_read_verify.py | 4 tools/xm-test/tests/block-integrity/02_block_device_write_verify.py | 4 tools/xm-test/tests/block-list/01_block-list_pos.py | 6 - tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py | 6 - tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py | 10 +- tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py | 24 ++--- 22 files changed, 128 insertions(+), 130 deletions(-)
tools/xm-test/tests/block-create/01_block_attach_device_pos.py +5 -5
@@ -32,12 +32,12 @@ except ConsoleError, e: FAIL(str(e)) -block_attach(domain, "phy:ram1", "sdb1") +block_attach(domain, "phy:ram1", "xvda1") -try: - run = console.runCmd("cat /proc/partitions") +try: + run = console.runCmd("cat /proc/partitions") except ConsoleError, e: - FAIL(str(e)) + FAIL(str(e)) # Close the console domain.closeConsole()
@@ -45,5 +45,5 @@ domain.closeConsole() # Stop the domain (nice shutdown) domain.stop() -if not re.search("sdb1",run["output"]): +if not re.search("xvda1",run["output"]): FAIL("Device is not actually connected to the domU")
tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py +4 -4
@@ -32,10 +32,10 @@ except ConsoleError, e: FAIL(str(e)) -block_attach(domain, "file:/dev/ram1", "sdb2") +block_attach(domain, "file:/dev/ram1", "xvda1") try: - run = console.runCmd("cat /proc/partitions") + run = console.runCmd("cat /proc/partitions") except ConsoleError, e: FAIL(str(e))
@@ -45,5 +45,5 @@ domain.closeConsole() # Stop the domain (nice shutdown) domain.stop() -if not re.search("sdb2",run["output"]): - FAIL("Device is not actually connected to the domU") +if not re.search("xvda1",run["output"]): + FAIL("Device is not actually connected to the domU")
tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py +8 -8
@@ -30,14 +30,14 @@ except ConsoleError, e: FAIL(str(e)) for i in range(10): - status, output = traceCommand("xm block-attach %s phy:ram1 sdb1 w" % domain.getName()) - if i == 0 and status != 0: - FAIL("xm block attach returned invalid %i != 0" % status) - if i > 0 and status == 0: - FAIL("xm block-attach (repeat) returned invalid %i > 0" % status) - run = console.runCmd("cat /proc/partitions") - if not re.search("sdb1", run['output']): - FAIL("Device is not actually attached to domU") + status, output = traceCommand("xm block-attach %s phy:ram1 xvda1 w" % domain.getName()) + if i == 0 and status != 0: + FAIL("xm block attach returned invalid %i != 0" % status) + if i > 0 and status == 0: + FAIL("xm block-attach (repeat) returned invalid %i > 0" % status) + run = console.runCmd("cat /proc/partitions") + if not re.search("xvda1", run['output']): + FAIL("Device is not actually attached to domU") # Close the console domain.closeConsole()
tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py +9 -9
@@ -32,15 +32,15 @@ except ConsoleError, e: for i in range(10): - block_attach(domain, "phy:ram1", "sdb1") - run = console.runCmd("cat /proc/partitions") - if not re.search("sdb1", run["output"]): - FAIL("Failed to attach block device: /proc/partitions does not show that!") - - block_detach(domain, "sdb1") - run = console.runCmd("cat /proc/partitions") - if re.search("sdb1", run["output"]): - FAIL("Failed to dettach block device: /proc/partitions still showing that!") + block_attach(domain, "phy:ram1", "xvda1") + run = console.runCmd("cat /proc/partitions") + if not re.search("xvda1", run["output"]): + FAIL("Failed to attach block device: /proc/partitions does not show that!") + + block_detach(domain, "xvda1") + run = console.runCmd("cat /proc/partitions") + if re.search("xvda1", run["output"]): + FAIL("Failed to dettach block device: /proc/partitions still showing that!") # Close the console domain.closeConsole()
tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py +3 -5
@@ -8,13 +8,11 @@ if ENABLE_HVM_SUPPORT: if ENABLE_HVM_SUPPORT: SKIP("Block-attach not supported for HVM domains") -status, output = traceCommand("xm block-attach NOT-EXIST phy:ram1 sdb1 w") +status, output = traceCommand("xm block-attach NOT-EXIST phy:ram1 xvda1 w") eyecatcher = "Error" where = output.find(eyecatcher) if status == 0: - FAIL("xm block-attach returned bad status, expected non 0, status is: %i" % status ) + FAIL("xm block-attach returned bad status, expected non 0, status is: %i" % status ) elif where == -1: - FAIL("xm block-attach returned bad output, expected Error, output is: %s" % output ) - - + FAIL("xm block-attach returned bad output, expected Error, output is: %s" % output )
tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py +7 -7
@@ -30,18 +30,18 @@ except ConsoleError, e: FAIL(str(e)) -status, output = traceCommand("xm block-attach %s phy:NOT-EXIST sdb1 w" % domain.getName()) +status, output = traceCommand("xm block-attach %s phy:NOT-EXIST xvda1 w" % domain.getName()) eyecatcher = "Error" where = output.find(eyecatcher) if status == 0: - FAIL("xm block-attach returned bad status, expected non 0, status is: %i" % status ) + FAIL("xm block-attach returned bad status, expected non 0, status is: %i" % status ) elif where == -1: - FAIL("xm block-attach returned bad output, expected Error, output is: %s" % output ) + FAIL("xm block-attach returned bad output, expected Error, output is: %s" % output ) try: - run = console.runCmd("cat /proc/partitions") + run = console.runCmd("cat /proc/partitions") except ConsoleError, e: - FAIL(str(e)) + FAIL(str(e)) # Close the console domain.closeConsole()
@@ -49,5 +49,5 @@ domain.closeConsole() # Stop the domain (nice shutdown) domain.stop() -if re.search("sdb1",run["output"]): - FAIL("Non existent Device was connected to the domU") +if re.search("xvda1",run["output"]): + FAIL("Non existent Device was connected to the domU")
tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py +8 -8
@@ -29,18 +29,18 @@ except ConsoleError, e: saveLog(console.getHistory()) FAIL(str(e)) -status, output = traceCommand("xm block-attach %s file:/dev/NOT-EXIST sdb1 w" % domain.getName()) +status, output = traceCommand("xm block-attach %s file:/dev/NOT-EXIST xvda1 w" % domain.getName()) eyecatcher = "Error" where = output.find(eyecatcher) if status == 0: - FAIL("xm block-attach returned bad status, expected non 0, status is: %i" % status ) + FAIL("xm block-attach returned bad status, expected non 0, status is: %i" % status ) elif where == -1: - FAIL("xm block-attach returned bad output, expected Error, output is: %s" % output ) - + FAIL("xm block-attach returned bad output, expected Error, output is: %s" % output ) + try: - run = console.runCmd("cat /proc/partitions") + run = console.runCmd("cat /proc/partitions") except ConsoleError, e: - FAIL(str(e)) + FAIL(str(e)) # Close the console domain.closeConsole()
@@ -48,5 +48,5 @@ domain.closeConsole() # Stop the domain (nice shutdown) domain.stop() -if re.search("sdb1",run["output"]): - FAIL("Non existent Device was connected to the domU") +if re.search("xvda1",run["output"]): + FAIL("Non existent Device was connected to the domU")
tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py +22 -22
56 lines not on this page · raw message
tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py +15 -15
@@ -15,7 +15,7 @@ def availableRamdisks(): def availableRamdisks(): i = 0 while os.access("/dev/ram%d" % i, os.F_OK ): - i += 1 + i += 1 return i
@@ -36,7 +36,7 @@ def detach(devname): return -2, "Failed to detach block device: /proc/partitions still showing that!" return 0, None - + if ENABLE_HVM_SUPPORT: SKIP("Block-attach not supported for HVM domains")
@@ -69,22 +69,22 @@ while i < ramdisks or devices: op = random.randint(0,1) # 1 = attach, 0 = detach if (not devices or op) and i < ramdisks: i += 1 - devname = "/dev/hda%d" % i - phy = "/dev/ram%d" % i - print "Attaching %s to %s" % (devname, phy) - status, msg = attach( phy, devname ) - if status: - FAIL(msg) - else: - devices.append(devname) + devname = "/dev/xvda%d" % i + phy = "/dev/ram%d" % i + print "Attaching %s to %s" % (devname, phy) + status, msg = attach( phy, devname ) + if status: + FAIL(msg) + else: + devices.append(devname) elif devices: devname = random.choice(devices) - devices.remove(devname) - print "Detaching %s" % devname - status, msg = detach(devname) - if status: - FAIL(msg) + devices.remove(devname) + print "Detaching %s" % devname + status, msg = detach(devname) + if status: + FAIL(msg) # Close the console domain.closeConsole()
tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py +1 -1
@@ -24,7 +24,7 @@ if s != 0: # Now try to start a DomU with write access to /dev/ram0 -config = {"disk":"phy:/dev/ram0,hda1,w"} +config = {"disk":"phy:/dev/ram0,xvda1,w"} domain = XmTestDomain(extraConfig=config);
tools/xm-test/tests/block-create/12_block_attach_shared_domU.py +1 -1
@@ -8,7 +8,7 @@ if ENABLE_HVM_SUPPORT: if ENABLE_HVM_SUPPORT: SKIP("Block-attach not supported for HVM domains") -config = {"disk":"phy:/dev/ram0,hda1,w"} +config = {"disk":"phy:/dev/ram0,xvda1,w"} dom1 = XmTestDomain(extraConfig=config) dom2 = XmTestDomain(dom1.getName() + "-2",
tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py +4 -4
@@ -9,7 +9,7 @@ if ENABLE_HVM_SUPPORT: if ENABLE_HVM_SUPPORT: SKIP("Block-detach not supported for HVM domains") -config = {"disk":"phy:/dev/ram0,hda1,w"} +config = {"disk":"phy:/dev/ram0,xvda1,w"} domain = XmTestDomain(extraConfig=config) try:
@@ -21,7 +21,7 @@ except DomainError, e: try: console.setHistorySaveCmds(value=True) - run = console.runCmd("cat /proc/partitions | grep hda1") + run = console.runCmd("cat /proc/partitions | grep xvda1") run2 = console.runCmd("cat /proc/partitions") except ConsoleError, e: FAIL(str(e))
@@ -29,10 +29,10 @@ if run["return"] != 0: if run["return"] != 0: FAIL("block device isn't attached; can't detach!") -block_detach(domain, "hda1") +block_detach(domain, "xvda1") try: - run = console.runCmd("cat /proc/partitions | grep hda1") + run = console.runCmd("cat /proc/partitions | grep xvda1") except ConsoleError, e: saveLog(console.getHistory()) FAIL(str(e))
tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py +4 -4
@@ -18,9 +18,9 @@ except DomainError, e: print e.extra FAIL("Unable to create domain") -block_attach(domain, "phy:/dev/ram0", "hda1") +block_attach(domain, "phy:/dev/ram0", "xvda1") try: - run = console.runCmd("cat /proc/partitions | grep hda1") + run = console.runCmd("cat /proc/partitions | grep xvda1") except ConsoleError, e: saveLog(console.getHistory()) FAIL(str(e))
@@ -28,9 +28,9 @@ if run["return"] != 0: if run["return"] != 0: FAIL("Failed to verify that block dev is attached") -block_detach(domain, "hda1") +block_detach(domain, "xvda1") try: - run = console.runCmd("cat /proc/partitions | grep hda1") + run = console.runCmd("cat /proc/partitions | grep xvda1") except ConsoleError, e: saveLog(console.getHistory()) FAIL(str(e))
tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py +1 -1
@@ -19,7 +19,7 @@ except DomainError, e: print e.extra FAIL("Unable to create domain") -status, output = traceCommand("xm block-detach %s sda1" % domain.getId()) +status, output = traceCommand("xm block-detach %s xvda1" % domain.getId()) eyecatcher1 = "Error:" eyecatcher2 = "Traceback"
tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py +4 -4
@@ -9,7 +9,7 @@ if ENABLE_HVM_SUPPORT: if ENABLE_HVM_SUPPORT: SKIP("Block-detach not supported for HVM domains") -config = {"disk":"phy:/dev/ram0,hda1,w"} +config = {"disk":"phy:/dev/ram0,xvda1,w"} domain = XmTestDomain(extraConfig=config) try:
@@ -20,7 +20,7 @@ except DomainError, e: FAIL("Unable to create domain") try: - run = console.runCmd("cat /proc/partitions | grep hda1") + run = console.runCmd("cat /proc/partitions | grep xvda1") run2 = console.runCmd("cat /proc/partitions") except ConsoleError, e: FAIL(str(e))
@@ -28,10 +28,10 @@ if run["return"] != 0: if run["return"] != 0: FAIL("block device isn't attached; can't detach!") -block_detach(domain, "hda1") +block_detach(domain, "xvda1") try: - run = console.runCmd("cat /proc/partitions | grep hda1") + run = console.runCmd("cat /proc/partitions | grep xvda1") except ConsoleError, e: saveLog(console.getHistory()) FAIL(str(e))
tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py +5 -5
@@ -12,7 +12,7 @@ def checkXmLongList(domain): s, o = traceCommand("xm list --long %s" % domain.getName()) if s != 0: FAIL("xm list --long <dom> failed") - if re.search("hda1", o): + if re.search("xvda1", o): return True else: return False
@@ -27,12 +27,12 @@ except DomainError,e: except DomainError,e: FAIL(str(e)) -block_attach(domain, "phy:/dev/ram0", "hda1") +block_attach(domain, "phy:/dev/ram0", "xvda1") if not checkXmLongList(domain): - FAIL("xm long list does not show that hda1 was attached") + FAIL("xm long list does not show that xvda1 was attached") -block_detach(domain, "hda1") +block_detach(domain, "xvda1") if checkXmLongList(domain): - FAIL("xm long list does not show that hda1 was removed") + FAIL("xm long list does not show that xvda1 was removed")
tools/xm-test/tests/block-integrity/01_block_device_read_verify.py +2 -2
@@ -33,10 +33,10 @@ s, o = traceCommand("md5sum /dev/ram1") dom0_md5sum_match = re.search(r"^[\dA-Fa-f]{32}", o, re.M) -block_attach(domain, "phy:ram1", "hda1") +block_attach(domain, "phy:ram1", "xvda1") try: - run = console.runCmd("md5sum /dev/hda1") + run = console.runCmd("md5sum /dev/xvda1") except ConsoleError, e: FAIL(str(e))
tools/xm-test/tests/block-integrity/02_block_device_write_verify.py +2 -2
@@ -28,12 +28,12 @@ except DomainError, e: console.setHistorySaveCmds(value=True) -block_attach(domain, "phy:ram1", "hda1") +block_attach(domain, "phy:ram1", "xvda1") console.setTimeout(120) try: - run = console.runCmd("dd if=/dev/urandom bs=512 count=`cat /sys/block/hda1/size` | tee /dev/hda1 | md5sum") + run = console.runCmd("dd if=/dev/urandom bs=512 count=`cat /sys/block/xvda1/size` | tee /dev/xvda1 | md5sum") except ConsoleError, e: FAIL(str(e))
tools/xm-test/tests/block-list/01_block-list_pos.py +3 -3
@@ -11,7 +11,7 @@ if ENABLE_HVM_SUPPORT: if ENABLE_HVM_SUPPORT: SKIP("Block-list not supported for HVM domains") -config = {"disk":"phy:/dev/ram0,hda1,w"} +config = {"disk":"phy:/dev/ram0,xvda1,w"} domain = XmTestDomain(extraConfig=config) try:
@@ -22,7 +22,7 @@ except DomainError, e: FAIL("Unable to create domain") status, output = traceCommand("xm block-list %s" % domain.getId()) -eyecatcher = "769" +eyecatcher = "51713" where = output.find(eyecatcher) if status != 0: FAIL("xm block-list returned bad status, expected 0, status is %i" % status)
@@ -31,7 +31,7 @@ elif where < 0: #Verify the block device on DomainU try: - run = console.runCmd("cat /proc/partitions | grep hda1") + run = console.runCmd("cat /proc/partitions | grep xvda1") except ConsoleError, e: saveLog(console.getHistory()) FAIL(str(e))
tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py +3 -3
@@ -22,11 +22,11 @@ except DomainError, e: FAIL("Unable to create domain") #Attach one virtual block device to domainU -block_attach(domain, "phy:/dev/ram0", "hda1") +block_attach(domain, "phy:/dev/ram0", "xvda1") #Verify block-list on Domain0 status, output = traceCommand("xm block-list %s" % domain.getId()) -eyecatcher = "769" +eyecatcher = "51713" where = output.find(eyecatcher) if status != 0: FAIL("xm block-list returned bad status, expected 0, status is %i" % status)
@@ -35,7 +35,7 @@ elif where < 0 : #Verify attached block device on DomainU try: - run = console.runCmd("cat /proc/partitions | grep hda1") + run = console.runCmd("cat /proc/partitions | grep xvda1") except ConsoleError, e: saveLog(console.getHistory()) FAIL(str(e))
tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py +5 -5
@@ -11,7 +11,7 @@ if ENABLE_HVM_SUPPORT: if ENABLE_HVM_SUPPORT: SKIP("Block-list not supported for HVM domains") -config = {"disk":"phy:/dev/ram0,hda1,w"} +config = {"disk":"phy:/dev/ram0,xvda1,w"} domain = XmTestDomain(extraConfig=config) try:
@@ -26,14 +26,14 @@ if status != 0: FAIL("Fail to list block device") #Add another virtual block device to the domain -status, output = traceCommand("xm block-attach %s phy:/dev/ram1 hda2 w" % domain.getId()) +status, output = traceCommand("xm block-attach %s phy:/dev/ram1 xvda2 w" % domain.getId()) if status != 0: FAIL("Fail to attach block device") #Verify block-list on Domain0 status, output = traceCommand("xm block-list %s" % domain.getId()) -eyecatcher1 = "769" -eyecatcher2 = "770" +eyecatcher1 = "51713" +eyecatcher2 = "51714" where1 = output.find(eyecatcher1) where2 = output.find(eyecatcher2) if status != 0:
@@ -43,7 +43,7 @@ elif (where1 < 0) and (where2 < 0): #Verify attached block device on DomainU try: - run = console.runCmd("cat /proc/partitions | grep hda1;cat /proc/partitions | grep hda2") + run = console.runCmd("cat /proc/partitions | grep xvda1;cat /proc/partitions | grep xvda2") except ConsoleError, e: saveLog(console.getHistory()) FAIL(str(e))
tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py +12 -12
@@ -22,39 +22,39 @@ if o: if o: FAIL("block-list without devices reported something!") -block_attach(domain, "phy:/dev/ram0", "hda1") +block_attach(domain, "phy:/dev/ram0", "xvda1") s, o = traceCommand("xm block-list %s" % domain.getName()) if s != 0: FAIL("block-list failed") -if o.find("769") == -1: +if o.find("51713") == -1: FAIL("block-list didn't show the block device I just attached!") -block_attach(domain, "phy:/dev/ram1", "hda2") +block_attach(domain, "phy:/dev/ram1", "xvda2") s, o = traceCommand("xm block-list %s" % domain.getName()) if s != 0: FAIL("block-list failed") -if o.find("770") == -1: +if o.find("51714") == -1: FAIL("block-list didn't show the other block device I just attached!") -block_detach(domain, "hda1") +block_detach(domain, "xvda1") s, o = traceCommand("xm block-list %s" % domain.getName()) if s != 0: FAIL("block-list failed after detaching a device") -if o.find("769") != -1: - FAIL("hda1 still shown in block-list after detach!") -if o.find("770") == -1: - FAIL("hda2 not shown after detach of hda1!") +if o.find("51713") != -1: + FAIL("xvda1 still shown in block-list after detach!") +if o.find("51714") == -1: + FAIL("xvda2 not shown after detach of xvda1!") -block_detach(domain, "hda2") +block_detach(domain, "xvda2") s, o = traceCommand("xm block-list %s" % domain.getName()) if s != 0: FAIL("block-list failed after detaching another device") -if o.find("770") != -1: - FAIL("hda2 still shown in block-list after detach!") +if o.find("51714") != -1: + FAIL("xvda2 still shown in block-list after detach!") if o: FAIL("block-list still shows something after all devices detached!")
PATCH 2/3 Add xvd devices to the initrd
In reply to Tony BreedsAdd xvd devices to the initrd.
---
tools/xm-test/ramdisk/patches/buildroot/add_xvd_devices.patch | 13 ++++++++++
1 file changed, 13 insertions(+)
tools/xm-test/ramdisk/patches/buildroot/add_xvd_devices.patch new file +13 -0
@@ -0,0 +1,13 @@ +--- buildroot/target/generic/device_table.txt~ 2006-10-26 17:38:04.000000000 +1000 ++++ buildroot/target/generic/device_table.txt 2006-10-26 17:37:08.000000000 +1000 +@@ -169,3 +169,10 @@ + #/dev/mcd b 640 0 0 23 0 0 0 - + #/dev/optcd b 640 0 0 17 0 0 0 - + ++# Xen Virtual Block Devices ++/dev/xvda b 640 0 0 202 0 0 0 - ++/dev/xvda b 640 0 0 202 1 1 1 4 ++/dev/xvdb b 640 0 0 202 16 0 0 - ++/dev/xvdb b 640 0 0 202 17 1 1 4 ++/dev/xvdc b 640 0 0 202 32 0 0 - ++/dev/xvdc b 640 0 0 202 33 1 1 4
PATCH 3/3 Bump xm-test version to 1.1 to accommodate new devices
In reply to Tony BreedsBump xm-test version to 1.1 to accommodate new devices.
---
tools/xm-test/configure.ac | 2tools/xm-test/ramdisk/README-XenSource-initrd-1.1-img | 45 ++++++++++
2 files changed, 46 insertions(+), 1 deletion(-)
tools/xm-test/configure.ac +1 -1
@@ -1,7 +1,7 @@ # xm-test configure.ac input script # Basic header information -AC_INIT([xm-test], [1.0.0]) +AC_INIT([xm-test], [1.1.0]) AM_INIT_AUTOMAKE([1.7 foreign]) MK=''; AC_SUBST(MK)
tools/xm-test/ramdisk/README-XenSource-initrd-1.1-img new file +45 -0
45 lines not on this page · raw message
Quoted 6 lines · Tony Breeds
Hello All,
This patch Updates all the block specific tests in xm-test to
use the Xen Virtual Block Devices rather than overriding the SCSI or IDE subsystems. It also cleans up some whitespace problems (Which looking back I should have done in a separate patchset).
Quoted 8 lines
The last patch (3/3) bumps the version number of xm-test to 1.1, as these new block tests will certainly fail with older initrd's due to the lack of xvd device nodes in the initrd.
I've tested these patches with no regressions on x86, and a number of improvements on PPC.
Signed-off-by Tony Breeds <[email protected]>
Series applied, thanks Tony. It's queuing up behind a big change, but its on the way once our tests have passed.
Ewan.