[Libvirt-cim] [PATCH] [TEST] Updating some more tc for for Association parameter changes

[Deepti B. Kalakeri]

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1223040869 25200
# Node ID a2cbe9ff6889c49c9a4478a592d3a10b55e64c1a
# Parent  e437224852a71d5123f66c998a15d7893e1528dc
[TEST] Updating some more tc for for Association parameter changes

1) updated CS 41_cs_to_settingdefinestate.py tc.
2) updated HostedResourcePool/01_forward.py
3) updated HostedResourcePool/02_reverse.py
4) SettingsDefineCapabilities/01_forward.py
5) SettingsDefineCapabilities/04_forward_vsmsdata.py


Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r e437224852a7 -r a2cbe9ff6889 suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py	Fri Oct 03 05:35:35 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py	Fri Oct 03 06:34:29 2008 -0700
@@ -150,8 +150,7 @@ def get_associatornames_info(server, vir
                                          an,
                                          cn,
                        CreationClassName=cn,
-                                Name = name,
-                                  virt=virt)
+                                Name = name)
         if len(assoc_info) < 1:
             logger.error("%s returned %i %s objects" % (an, len(assoc_info), qcn))
             status = FAIL
@@ -171,8 +170,7 @@ def get_associators_info(server, virt, v
         assoc_info = Associators(server,
                                      an,
                                      cn,
-                    InstanceID = instid,
-                              virt=virt)
+                    InstanceID = instid)
         if len(assoc_info) < 1:
             logger.error("%s returned %i %s objects" % 
                          (an, len(assoc_info), qcn))
@@ -239,8 +237,7 @@ def get_SDS_verify_RASD_build_vssdc_inpu
                                      DeviceID = devid,
                                      CreationClassName = cn,
                                      SystemName = test_dom,
-                                     SystemCreationClassName = sccn,
-                                     virt=virt)
+                                     SystemCreationClassName = sccn)
 
             # we expect only one RASD record to be returned for each device that is used to 
             # query with the SettingsDefineState association.
diff -r e437224852a7 -r a2cbe9ff6889 suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py
--- a/suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py	Fri Oct 03 05:35:35 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py	Fri Oct 03 06:34:29 2008 -0700
@@ -52,8 +52,7 @@ def main():
                                      assoc_cn,
                                      host_sys.CreationClassName,
                                      Name = host_sys.Name,
-                                     CreationClassName = host_sys.CreationClassName,
-                                     virt = options.virt)
+                                     CreationClassName = host_sys.CreationClassName)
     except Exception, details:
         logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % assoc_cn)
         logger.error("Exception:",  details)
diff -r e437224852a7 -r a2cbe9ff6889 suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py
--- a/suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py	Fri Oct 03 05:35:35 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py	Fri Oct 03 06:34:29 2008 -0700
@@ -59,8 +59,7 @@ def main():
 
     for k, v in poollist.items():
         try:
-            assoc_host = assoc.AssociatorNames(options.ip, assoc_cn, k, InstanceID = v, \
-                                                                     virt = options.virt)
+            assoc_host = assoc.AssociatorNames(options.ip, assoc_cn, k, InstanceID = v)
         except Exception:
             logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % v)
             return FAIL
diff -r e437224852a7 -r a2cbe9ff6889 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py
--- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py	Fri Oct 03 05:35:35 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py	Fri Oct 03 06:34:29 2008 -0700
@@ -167,7 +167,7 @@ def verify_sdc_with_ac(virt, server, poo
     for instid in sorted(instlist):
         try:
             assoc_info = assoc.Associators(server, assoc_cname, cn, 
-                                           InstanceID = instid, virt=virt)  
+                                           InstanceID = instid)  
             if len(assoc_info) != 4:
                 logger.error("%s returned %i ResourcePool objects"
                              "instead 4", assoc_cname, len(assoc_info))
diff -r e437224852a7 -r a2cbe9ff6889 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/04_forward_vsmsdata.py
--- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/04_forward_vsmsdata.py	Fri Oct 03 05:35:35 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/04_forward_vsmsdata.py	Fri Oct 03 06:34:29 2008 -0700
@@ -55,8 +55,7 @@ def main():
     qcn    = get_typed_class(options.virt, 'VirtualSystemMigrationCapabilities')
     instid = 'MigrationSettingData'
     try:
-        assoc_info = assoc.Associators(server, an, cn, InstanceID = instid, 
-                                                         virt=options.virt)  
+        assoc_info = assoc.Associators(server, an, cn, InstanceID = instid)  
         if len(assoc_info) != 1: 
             logger.error("%s returned %i %s objects", an, len(assoc_info), qcn)
             return FAIL
diff -r e437224852a7 -r a2cbe9ff6889 suites/libvirt-cim/lib/XenKvmLib/assoc.py
--- a/suites/libvirt-cim/lib/XenKvmLib/assoc.py	Fri Oct 03 05:35:35 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/assoc.py	Fri Oct 03 06:34:29 2008 -0700
@@ -45,6 +45,7 @@ def AssociatorNames(host, assoc_cn, clas
     names = []
 
     try:
+        logger.error("DEBUG instanceref, is %s", instanceref)
         names = conn.AssociatorNames(instanceref, AssocClass=assoc_cn)
     except pywbem.CIMError, arg:
         print arg[1]
@@ -67,6 +68,7 @@ def Associators(host, assoc_cn, classnam
     names = []
 
     try:
+        logger.error("DEBUG instanceref, is %s", instanceref)
         names = conn.Associators(instanceref, AssocClass=assoc_cn)
     except pywbem.CIMError, arg:
         print arg[1]