From: Yiqiao Pu <[email protected]>

Set up the image_filename for test cases in an env which vm will
use raw devices. User should config the image name and other
parameters in test config files.
Parameters added:
image_raw_device: default value should be no, set it to yes when
you use raw devices(like iscsi etc.)

change from v1:
remove the device access order in kvm_preprocessing.py to make it
more generic and flexible.

Signed-off-by: Yiqiao Pu <[email protected]>
---
 client/tests/kvm/kvm_vm.py             |    2 ++
 client/tests/kvm/tests_base.cfg.sample |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py
index a860437..c70b932 100755
--- a/client/tests/kvm/kvm_vm.py
+++ b/client/tests/kvm/kvm_vm.py
@@ -24,6 +24,8 @@ def get_image_filename(params, root_dir):
     """
     image_name = params.get("image_name", "image")
     image_format = params.get("image_format", "qcow2")
+    if params.get("image_raw_device") == "yes":
+        return image_name
     image_filename = "%s.%s" % (image_name, image_format)
     image_filename = kvm_utils.get_path(root_dir, image_filename)
     return image_filename
diff --git a/client/tests/kvm/tests_base.cfg.sample 
b/client/tests/kvm/tests_base.cfg.sample
index 23232f3..73b32f3 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -61,7 +61,7 @@ run_tcpdump = yes
 # Misc
 profilers = kvm_stat
 login_timeout = 360
-
+image_raw_device = no
 
 # Tests
 variants:
-- 
1.7.1

_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest

Reply via email to