1.1 --- a/tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py	Mon Feb 26 09:12:55 2007 +0000
     1.2 +++ b/tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py	Mon Feb 26 09:13:50 2007 +0000
     1.3 @@ -43,7 +43,7 @@ except ConsoleError, e:
     1.4  
     1.5  # Explicitly label the 1st resource
     1.6  ACMLabelResource(resource1, resourcelabel1)
     1.7 -block_utils.block_attach(domain, resource1, "sdb1")
     1.8 +block_utils.block_attach(domain, resource1, "xvda1")
     1.9  
    1.10  try:
    1.11  	run1 = console.runCmd("cat /proc/partitions")
    1.12 @@ -54,10 +54,10 @@ except ConsoleError, e:
    1.13  ACMLabelResource(resource2, resourcelabel2)
    1.14  #Cannot call block_attach here since we legally may fail the command
    1.15  status, output = traceCommand("xm block-attach %s %s %s w" %
    1.16 -                               (domain.getName(), resource2, "sdb2" ))
    1.17 +                               (domain.getName(), resource2, "xvda2" ))
    1.18  
    1.19  for i in range(10):
    1.20 -    if block_utils.get_state(domain, "sdb2") == 4:
    1.21 +    if block_utils.get_state(domain, "xvda2") == 4:
    1.22          break
    1.23      time.sleep(1)
    1.24  
    1.25 @@ -72,11 +72,11 @@ domain.closeConsole()
    1.26  # Stop the domain (nice shutdown)
    1.27  domain.stop()
    1.28  
    1.29 -if not re.search("sdb1",run1["output"]):
    1.30 -    FAIL("Labeled device 'sdb1' is not actually connected to the domU")
    1.31 +if not re.search("xvda1",run1["output"]):
    1.32 +    FAIL("Labeled device 'xvda1' is not actually connected to the domU")
    1.33  
    1.34 -if not re.search("sdb1",run2["output"]):
    1.35 -    FAIL("Labeled device 'sdb1' has disappeared?!")
    1.36 +if not re.search("xvda1",run2["output"]):
    1.37 +    FAIL("Labeled device 'xbvda1' has disappeared?!")
    1.38  
    1.39 -if re.search("sdb2",run2["output"]):
    1.40 -    FAIL("Labeled device 'sdb2' is connected to the domU but should not be")
    1.41 +if re.search("xvda2",run2["output"]):
    1.42 +    FAIL("Labeled device 'xvda2' is connected to the domU but should not be")