diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-02-26 09:13:50 +0000 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-02-26 09:13:50 +0000 |
| commit | 8705acb3403f5d7f7d3207182451a301601fffdb (patch) | |
| tree | 97ddfeb2540b405a7087d9372e2e303a8b05c563 /tools/xm-test | |
| parent | 5d606a4e681c858c68a1827687c5caeb26bfd9c0 (diff) | |
| download | xen-8705acb3403f5d7f7d3207182451a301601fffdb.tar.gz xen-8705acb3403f5d7f7d3207182451a301601fffdb.tar.bz2 xen-8705acb3403f5d7f7d3207182451a301601fffdb.zip | |
xm-test, acm: Use xvda* device name instead of sdb* device inside guest domain.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
Diffstat (limited to 'tools/xm-test')
| -rw-r--r-- | tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py b/tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py index f3908f7820..1c9315869f 100644 --- a/tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py +++ b/tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py @@ -43,7 +43,7 @@ except ConsoleError, e: # Explicitly label the 1st resource ACMLabelResource(resource1, resourcelabel1) -block_utils.block_attach(domain, resource1, "sdb1") +block_utils.block_attach(domain, resource1, "xvda1") try: run1 = console.runCmd("cat /proc/partitions") @@ -54,10 +54,10 @@ except ConsoleError, e: ACMLabelResource(resource2, resourcelabel2) #Cannot call block_attach here since we legally may fail the command status, output = traceCommand("xm block-attach %s %s %s w" % - (domain.getName(), resource2, "sdb2" )) + (domain.getName(), resource2, "xvda2" )) for i in range(10): - if block_utils.get_state(domain, "sdb2") == 4: + if block_utils.get_state(domain, "xvda2") == 4: break time.sleep(1) @@ -72,11 +72,11 @@ domain.closeConsole() # Stop the domain (nice shutdown) domain.stop() -if not re.search("sdb1",run1["output"]): - FAIL("Labeled device 'sdb1' is not actually connected to the domU") +if not re.search("xvda1",run1["output"]): + FAIL("Labeled device 'xvda1' is not actually connected to the domU") -if not re.search("sdb1",run2["output"]): - FAIL("Labeled device 'sdb1' has disappeared?!") +if not re.search("xvda1",run2["output"]): + FAIL("Labeled device 'xbvda1' has disappeared?!") -if re.search("sdb2",run2["output"]): - FAIL("Labeled device 'sdb2' is connected to the domU but should not be") +if re.search("xvda2",run2["output"]): + FAIL("Labeled device 'xvda2' is connected to the domU but should not be") |