+ + status, dpool_name = create_diskpool_conf(options.ip, options.virt) + if status != PASS: + logger.error("Failed to create diskpool") + return FAIL + try: host_sys = hostsystem.enumerate(options.ip, options.virt)[0] except Exception: @@ -69,7 +76,12 @@ def main(): status = PASS if cname.find("ProcessorPool") >=0 and items['InstanceID'] == "ProcessorPool/0": status = PASS - + if cname.find("NetworkPool") >=0 and items['InstanceID'] == "NetworkPool/cimtest-networkpool":
Instead of hard coding the name of the network pool, it'd be a good idea to use default_network_name from const.py. That way, if the network pool name changes, we don't have to modify the individual tests.
+ status = PASS + if cname.find("DiskPool") >=0 and items['InstanceID'] == "DiskPool/foo":
Instead of hard coding this value, use the value returned by dpool_name. For version of libvirt that don't have disk pool support, we use "foo" as the InstanceID. But for versions of libvirt that support storage pools, the name of the pool is different.
+ status = PASS + + cleanup_restore(options.ip, options.virt) return status if __name__ == "__main__": sys.exit(main()) diff -r 6995ae30dc81 -r e981649cf307 suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py
diff -r 6995ae30dc81 -r e981649cf307 suites/libvirt-cim/cimtest/HostedResourcePool/04_reverse_errs.py
The same comment for these two tests. Thanks! -- Kaitlin Rupert IBM Linux Technology Center kaitlin@linux.vnet.ibm.com