[Libvirt-cim] [PATCH 05 of 10] [TEST] Updating HS tc's for Association parameter changes

[Deepti B. Kalakeri]

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1223024080 25200
# Node ID c005ad2d0cd20f21ea75ec35b0476a9ea98a36ce
# Parent  fae408bcf9a3cac00a84499ea01b9606ca51defa
[TEST] Updating HS tc's for Association parameter changes

Updated 02_hostsystem_to_rasd.py, 03_hs_to_settdefcap.py, 04_hs_to_EAPF.py, 06_hs_to_vsms.py
for Association parameter changes.

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

diff -r fae408bcf9a3 -r c005ad2d0cd2 suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
--- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Fri Oct 03 01:33:09 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Fri Oct 03 01:54:40 2008 -0700
@@ -119,7 +119,6 @@ def get_assoc_info(server, cn, an, qcn, 
         assoc_info = AssociatorNames(server,
                                      an,
                                      cn,
-                                     virt,
                                      CreationClassName = cn,
                                      Name = name)
         if len(assoc_info) < 1:
@@ -157,7 +156,6 @@ def verify_RASD_values(server, sd_assoc_
             assoc_info = Associators(server,
                                      an,
                                      cn,
-                                     virt,
                                      DeviceID = devid,
                                      CreationClassName = cn,
                                      SystemName = test_dom,
diff -r fae408bcf9a3 -r c005ad2d0cd2 suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py
--- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py	Fri Oct 03 01:33:09 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py	Fri Oct 03 01:54:40 2008 -0700
@@ -128,7 +128,6 @@ def get_hostrespool(server, hostsys, cls
         assoc_info = Associators(server,
                                  an1,
                                  ccn1,
-                                 virt,
                                  CreationClassName = clsname,
                                  Name = hostsys)
         if len(assoc_info) < 4:
@@ -167,10 +166,9 @@ def get_alloccap(server, devpool, virt="
     for inst in devpool:
         try:
             assoc_info = Associators(server,
-                                 an,
-                                 inst.classname,
-                                 virt,
-                                 InstanceID = inst['InstanceID'])
+                                     an,
+                                     inst.classname,
+                                     InstanceID = inst['InstanceID'])
 
             if len(assoc_info) < 1:
                 logger.error("ElementCapabilities has returned %i objects", len(assoc_info))
@@ -221,7 +219,6 @@ def get_rasddetails(server, alloccap, vi
             assoc_info = Associators(server,
                                      an,
                                      ccn,
-                                     virt,
                                      InstanceID = ap['InstanceID'])
 
             if len(assoc_info) != 4:
diff -r fae408bcf9a3 -r c005ad2d0cd2 suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py
--- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py	Fri Oct 03 01:33:09 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py	Fri Oct 03 01:54:40 2008 -0700
@@ -154,7 +154,6 @@ def get_assocname_info(server, cn, an, q
         assoc_info = AssociatorNames(server,
                                          an,
                                          cn,
-                                       virt,
                        CreationClassName=cn,
                             Name = hostname)
         if len(assoc_info) < 1:
@@ -184,7 +183,7 @@ def verify_eafp_values(server, in_pllist
     for cn,  instid in sorted(in_pllist.items()):
         qcn = cn
         try:
-            assoc_info = Associators(server, an, cn, virt, InstanceID = instid)  
+            assoc_info = Associators(server, an, cn, InstanceID = instid)  
             inst_list = get_inst_for_dom(assoc_info)
             status = check_len(an, inst_list, qcn, exp_len)
             if status != PASS:
diff -r fae408bcf9a3 -r c005ad2d0cd2 suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py
--- a/suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py	Fri Oct 03 01:33:09 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py	Fri Oct 03 01:54:40 2008 -0700
@@ -85,9 +85,11 @@ def get_assocnames_info(server, cn, an, 
     status = PASS
     assoc_info = []
     try:
-        assoc_info = AssociatorNames(server, an, cn, virt, Name = name, CreationClassName = cn)
+        assoc_info = AssociatorNames(server, an, cn, Name = name, 
+                                     CreationClassName = cn)
         if len(assoc_info) < 0 :
-            logger.error("%s returned %i %s objects, expected atleast 3", an, len(assoc_info), qcn)
+            logger.error("%s returned %i %s objects, expected atleast 3", 
+                         an, len(assoc_info), qcn)
             status = FAIL
     except Exception, detail:
         print_err(CIM_ERROR_ASSOCIATORNAMES, detail, an)
@@ -120,8 +122,10 @@ def get_vsmcap_from_ec(vsms_list):
     sccn = vsms_info['SystemCreationClassName']
     assoc_info = []
     try:
-        assoc_info = AssociatorNames(server, assoc_name, cn, virt, CreationClassName = cn, 
-                                     SystemName = sn, Name = name, SystemCreationClassName = sccn)
+        assoc_info = AssociatorNames(server, assoc_name, cn, 
+                                     CreationClassName = cn, 
+                                     SystemName = sn, Name = name, 
+                                     SystemCreationClassName = sccn)
         if len(assoc_info) != 1:
             logger.error("%s returned %i %s objects, expected only 1", assoc_name, len(assoc_info), req_cn)
             status = FAIL
@@ -139,10 +143,11 @@ def get_vsmsd_from_sdc(vsmsd_list):
     instid = vsmsd_info['InstanceID']
     assoc_info = []
     try:
-        assoc_info = Associators(server, assoc_name, cn, virt, CreationClassName = cn, 
-                                                                  InstanceID = instid)
+        assoc_info = Associators(server, assoc_name, cn, 
+                                 CreationClassName = cn, InstanceID = instid)
         if len(assoc_info) != 1:
-            logger.error("%s returned %i %s objects, expected only 1", assoc_name, len(assoc_info), req_cn)
+            logger.error("%s returned %i %s objects, expected only 1", 
+                         assoc_name, len(assoc_info), req_cn)
             status = FAIL
 
     except Exception, detail: