sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] -exp_rc = 6 #CIM_ERR_NOT_FOUND -exp_desc = "No such instance" +exp_values = { + "invalid_ccname" : {"rc" : pywbem.CIM_ERR_NOT_FOUND, \ + "desc" : "No such instance (CreationClassName)"}, + "invalid_name" : {"rc" : pywbem.CIM_ERR_NOT_FOUND, \ + "desc" : "No such instance (Name)"} + }
Can you align all of the colons so that the list reads like: exp_values = { "invalid_ccname" : {"rc" : pywbem.CIM_ERR_NOT_FOUND, "desc" : "No such instance (CreationClassName)"}, "invalid_name" : {"rc" : pywbem.CIM_ERR_NOT_FOUND, "desc" : "No such instance (Name)"} } Also, no need for the slashes.
@do_main(sup_types) def main(): @@ -41,45 +46,41 @@ def main(): rc = -1
This value is no longer used - can you remove it?
+ rpcs = get_typed_class(options.virt, "ResourcePoolConfigurationService") + vsms = get_typed_class(options.virt, "VirtualSystemManagementService") + vsmigrations = get_typed_class(options.virt, "VirtualSystemMigrationService")
This line is longer than 80 characters - can you shorten the variable name some?
+ if ret != PASS: + logger.error("------ FAILED: Invalid Name Key Name.------") + return FAIL return status Daisy, I think you missed noticing my comment on the return status part in the previous 2 patches of yours. Never mind, Can you please change the last return status value and put it outside the for loop, otherwise the verification of the remaining information in the servicelist vsms : "Management Service" and vsmigrations : "MigrationService" will not get executed and the loop will exit immediately after verifying for the RPCS. Also, You can minimize the use of slash whenever not required.
Agreed - can you move return status so that it is not part of the for loop? It should be indented in so far. Thanks! -- Kaitlin Rupert IBM Linux Technology Center kaitlin@linux.vnet.ibm.com