- update this case, make it easy to get failure from result.
- fix some error in log message.
- close session before exception raised.
- update code style.
Signed-off-by: Qingtang Zhou <qzhou@xxxxxxxxxx>
---
client/tests/kvm/tests/physical_resources_check.py | 178 +++++++++++---------
1 files changed, 96 insertions(+), 82 deletions(-)
diff --git a/client/tests/kvm/tests/physical_resources_check.py b/client/tests/kvm/tests/physical_resources_check.py
index 5415a09..4e2df06 100644
--- a/client/tests/kvm/tests/physical_resources_check.py
+++ b/client/tests/kvm/tests/physical_resources_check.py
@@ -17,70 +17,31 @@ def run_physical_resources_check(test, params, env):
@param params: Dictionary with the test parameters
@param env: Dictionary with test environment.
"""
- vm = env.get_vm(params["main_vm"])
- vm.verify_alive()
- timeout = int(params.get("login_timeout", 360))
- session = vm.wait_for_login(timeout=timeout)
-
- logging.info("Starting physical resources check test")
- logging.info("Values assigned to VM are the values we expect "
- "to see reported by the Operating System")
- # Define a failure counter, as we want to check all physical
- # resources to know which checks passed and which ones failed
- n_fail = 0
-
- # We will check HDs with the image name
- image_name = virt_vm.get_image_filename(params, test.bindir)
-
- # Check cpu count
- logging.info("CPU count check")
- expected_cpu_nr = int(params.get("smp"))
- actual_cpu_nr = vm.get_cpu_count()
- if expected_cpu_nr != actual_cpu_nr:
- n_fail += 1
- logging.error("CPU count mismatch:")
- logging.error(" Assigned to VM: %s", expected_cpu_nr)
- logging.error(" Reported by OS: %s", actual_cpu_nr)
-
- # Check memory size
- logging.info("Memory size check")
- expected_mem = int(params.get("mem"))
- actual_mem = vm.get_memory_size()
- if actual_mem != expected_mem:
- n_fail += 1
- logging.error("Memory size mismatch:")
- logging.error(" Assigned to VM: %s", expected_mem)
- logging.error(" Reported by OS: %s", actual_mem)
-
# Define a function for checking number of hard drivers & NICs
def check_num(devices, info_cmd, check_str):
- f_fail = 0
+ f_fail = []
expected_num = params.objects(devices).__len__()
o = ""
try:
o = vm.monitor.info(info_cmd)
except kvm_monitor.MonitorError, e:
- f_fail += 1
- logging.error(e)
- logging.error("info/query monitor command failed (%s)", info_cmd)
+ fail_log = e + "\n"
+ fail_log += "info/query monitor command failed (%s)" % info_cmd
+ f_fail.append(fail_log)
+ logging.error(fail_log)
actual_num = string.count(o, check_str)
if expected_num != actual_num:
- f_fail += 1
- logging.error("%s number mismatch:")
- logging.error(" Assigned to VM: %d", expected_num)
- logging.error(" Reported by OS: %d", actual_num)
+ fail_log = "%s number mismatch:\n" % str(devices)
+ fail_log += " Assigned to VM: %d\n" % expected_num
+ fail_log += " Reported by OS: %d" % actual_num
+ f_fail.append(fail_log)
+ logging.error(fail_log)
return expected_num, f_fail
- logging.info("Hard drive count check")
- n_fail += check_num("images", "block", image_name)[1]
-
- logging.info("NIC count check")
- n_fail += check_num("nics", "network", "model=")[1]
-
# Define a function for checking hard drives & NICs' model
def chk_fmt_model(device, fmt_model, info_cmd, regexp):
- f_fail = 0
+ f_fail = []
devices = params.objects(device)
for chk_device in devices:
expected = params.object_params(chk_device).get(fmt_model)
@@ -90,10 +51,10 @@ def run_physical_resources_check(test, params, env):
try:
o = vm.monitor.info(info_cmd)
except kvm_monitor.MonitorError, e:
- f_fail += 1
- logging.error(e)
- logging.error("info/query monitor command failed (%s)",
- info_cmd)
+ fail_log = e + "\n"
+ fail_log += "info/query monitor command failed (%s)" % info_cmd
+ f_fail.append(fail_log)
+ logging.error(fail_log)
device_found = re.findall(regexp, o)
logging.debug("Found devices: %s", device_found)
@@ -103,29 +64,91 @@ def run_physical_resources_check(test, params, env):
found = True
if not found:
- f_fail += 1
- logging.error("%s model mismatch:", device)
- logging.error(" Assigned to VM: %s", expected)
- logging.error(" Reported by OS: %s", device_found)
+ fail_log = "%s model mismatch:\n" % str(device)
+ fail_log += " Assigned to VM: %s\n" % expected
+ fail_log += " Reported by OS: %s" % device_found
+ f_fail.append(fail_log)
+ logging.error(fail_log)
return f_fail
+ # Define a function to verify UUID & Serial number
+ def verify_device(expect, name, verify_cmd):
+ f_fail = []
+ if verify_cmd:
+ actual = session.cmd_output(verify_cmd)
+ if not string.upper(expect) in actual:
+ fail_log = "%s mismatch:\n" % name
+ fail_log += " Assigned to VM: %s\n" % string.upper(expect)
+ fail_log += " Reported by OS: %s" % actual
+ f_fail.append(fail_log)
+ logging.error(fail_log)
+ return f_fail
+
+
+ vm = env.get_vm(params["main_vm"])
+ vm.verify_alive()
+ timeout = int(params.get("login_timeout", 360))
+ session = vm.wait_for_login(timeout=timeout)
+
+ logging.info("Starting physical resources check test")
+ logging.info("Values assigned to VM are the values we expect "
+ "to see reported by the Operating System")
+ # Define a failure counter, as we want to check all physical
+ # resources to know which checks passed and which ones failed
+ n_fail = []
+
+ # We will check HDs with the image name
+ image_name = virt_vm.get_image_filename(params, test.bindir)
+
+ # Check cpu count
+ logging.info("CPU count check")
+ expected_cpu_nr = int(params.get("smp"))
+ actual_cpu_nr = vm.get_cpu_count()
+ if expected_cpu_nr != actual_cpu_nr:
+ fail_log = "CPU count mismatch:\n"
+ fail_log += " Assigned to VM: %s \n" % expected_cpu_nr
+ fail_log += " Reported by OS: %s" % actual_cpu_nr
+ n_fail.append(fail_log)
+ logging.error(fail_log)
+
+ # Check memory size
+ logging.info("Memory size check")
+ expected_mem = int(params.get("mem"))
+ actual_mem = vm.get_memory_size()
+ if actual_mem != expected_mem:
+ fail_log = "Memory size mismatch:\n"
+ fail_log += " Assigned to VM: %s\n" % expected_mem
+ fail_log += " Reported by OS: %s\n" % actual_mem
+ n_fail.append(fail_log)
+ logging.error(fail_log)
+
+
+ logging.info("Hard drive count check")
+ _, f_fail = check_num("images", "block", image_name)
+ n_fail.extend(f_fail)
+
+ logging.info("NIC count check")
+ _, f_fail = check_num("nics", "network", "model=")
+ n_fail.extend(f_fail)
+
logging.info("NICs model check")
f_fail = chk_fmt_model("nics", "nic_model", "network", "model=(.*),")
- n_fail += f_fail
+ n_fail.extend(f_fail)
logging.info("Drive format check")
f_fail = chk_fmt_model("images", "drive_format",
"block", "(.*)\: .*%s" % image_name)
- n_fail += f_fail
+ n_fail.extend(f_fail)
logging.info("Network card MAC check")
o = ""
try:
o = vm.monitor.info("network")
except kvm_monitor.MonitorError, e:
- n_fail += 1
- logging.error(e)
- logging.error("info/query monitor command failed (network)")
+ fail_log = e + "\n"
+ fail_log += "info/query monitor command failed (network)"
+ n_fail.append(fail_log)
+ logging.error(fail_log)
found_mac_addresses = re.findall("macaddr=(\S+)", o)
logging.debug("Found MAC adresses: %s", found_mac_addresses)
@@ -133,36 +156,27 @@ def run_physical_resources_check(test, params, env):
for nic_index in range(num_nics):
mac = vm.get_mac_address(nic_index)
if not string.lower(mac) in found_mac_addresses:
- n_fail += 1
- logging.error("MAC address mismatch:")
- logging.error(" Assigned to VM (not found): %s", mac)
-
- # Define a function to verify UUID & Serial number
- def verify_device(expect, name, verify_cmd):
- f_fail = 0
- if verify_cmd:
- actual = session.cmd_output(verify_cmd)
- if not string.upper(expect) in actual:
- f_fail += 1
- logging.error("%s mismatch:", name)
- logging.error(" Assigned to VM: %s", string.upper(expect))
- logging.error(" Reported by OS: %s", actual)
- return f_fail
+ fail_log = "MAC address mismatch:\n"
+ fail_log += " Assigned to VM (not found): %s" % mac
+ n_fail.append(fail_log)
+ logging.error(fail_log)
logging.info("UUID check")
if vm.get_uuid():
f_fail = verify_device(vm.get_uuid(), "UUID",
params.get("catch_uuid_cmd"))
- n_fail += f_fail
+ n_fail.extend(f_fail)
logging.info("Hard Disk serial number check")
catch_serial_cmd = params.get("catch_serial_cmd")
f_fail = verify_device(params.get("drive_serial"), "Serial",
catch_serial_cmd)
- n_fail += f_fail
+ n_fail.extend(f_fail)
if n_fail != 0:
- raise error.TestFail("Physical resources check test reported %s "
- "failures. Please verify the test logs." % n_fail)
+ session.close()
+ raise error.TestFail("Physical resources check test "
+ "reported %s failures:\n%s" % \
+ (len(n_fail), "\n".join(n_fail)))
session.close()
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
