[PATCH] [TEST] Update get_exp_template_rasd_len() based on template RASD additions
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1246477946 25200 # Node ID 857398f2e66069d7a8421c3229d821b8e82467ea # Parent a8b01b9726bf386defc29540e33f81e0850ac3a6 [TEST] Update get_exp_template_rasd_len() based on template RASD additions The providers now return template RASDs for both "bridge" and "network" interface types. In addition to that, the providers now return template DiskPoolRASDs for iSCSI pools Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r a8b01b9726bf -r 857398f2e660 suites/libvirt-cim/lib/XenKvmLib/rasd.py --- a/suites/libvirt-cim/lib/XenKvmLib/rasd.py Wed Jul 01 11:23:00 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/rasd.py Wed Jul 01 12:52:26 2009 -0700 @@ -320,7 +320,7 @@ exp_len = exp_base_num if id == "DiskPool/0": - pool_types = 5 + pool_types = 6 return exp_base_num * pool_types if virt == 'Xen' or virt == 'XenFV': @@ -363,8 +363,9 @@ if rev >= net_rasd_template_changes: dev_types = 2 + net_types = 2 - return exp_base_num * dev_types + return exp_base_num * dev_types * net_types def get_exp_template_rasd_len(virt, ip, id): curr_cim_rev, changeset = get_provider_version(virt, ip)
Tc fails for Xen with the following error: Testing Xen hypervisor -------------------------------------------------------------------- HostSystem - 03_hs_to_settdefcap.py: FAIL ERROR - Xen_SettingsDefineCapabilities returned 80 RASD objects instead of 16 for DiskPool/cimtest-diskpool CIM_ERR_INVALID_CLASS: Linux_ComputerSystem -------------------------------------------------------------------- Kaitlin Rupert wrote:
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1246477946 25200 # Node ID 857398f2e66069d7a8421c3229d821b8e82467ea # Parent a8b01b9726bf386defc29540e33f81e0850ac3a6 [TEST] Update get_exp_template_rasd_len() based on template RASD additions
The providers now return template RASDs for both "bridge" and "network" interface types. In addition to that, the providers now return template DiskPoolRASDs for iSCSI pools
Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com>
diff -r a8b01b9726bf -r 857398f2e660 suites/libvirt-cim/lib/XenKvmLib/rasd.py --- a/suites/libvirt-cim/lib/XenKvmLib/rasd.py Wed Jul 01 11:23:00 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/rasd.py Wed Jul 01 12:52:26 2009 -0700 @@ -320,7 +320,7 @@ exp_len = exp_base_num
if id == "DiskPool/0": - pool_types = 5 + pool_types = 6 return exp_base_num * pool_types
if virt == 'Xen' or virt == 'XenFV': @@ -363,8 +363,9 @@
if rev >= net_rasd_template_changes: dev_types = 2 + net_types = 2
- return exp_base_num * dev_types + return exp_base_num * dev_types * net_types
def get_exp_template_rasd_len(virt, ip, id): curr_cim_rev, changeset = get_provider_version(virt, ip)
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim
-- Thanks and Regards, Deepti B. Kalakeri IBM Linux Technology Center deeptik@linux.vnet.ibm.com
This is occurring because we are overwriting the exp_len calculation of line 337 with 339. Deepti B Kalakeri wrote:
Tc fails for Xen with the following error:
Testing Xen hypervisor -------------------------------------------------------------------- HostSystem - 03_hs_to_settdefcap.py: FAIL ERROR - Xen_SettingsDefineCapabilities returned 80 RASD objects instead of 16 for DiskPool/cimtest-diskpool CIM_ERR_INVALID_CLASS: Linux_ComputerSystem --------------------------------------------------------------------
Kaitlin Rupert wrote:
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1246477946 25200 # Node ID 857398f2e66069d7a8421c3229d821b8e82467ea # Parent a8b01b9726bf386defc29540e33f81e0850ac3a6 [TEST] Update get_exp_template_rasd_len() based on template RASD additions
The providers now return template RASDs for both "bridge" and "network" interface types. In addition to that, the providers now return template DiskPoolRASDs for iSCSI pools
Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com>
diff -r a8b01b9726bf -r 857398f2e660 suites/libvirt-cim/lib/XenKvmLib/rasd.py --- a/suites/libvirt-cim/lib/XenKvmLib/rasd.py Wed Jul 01 11:23:00 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/rasd.py Wed Jul 01 12:52:26 2009 -0700 @@ -320,7 +320,7 @@ exp_len = exp_base_num if id == "DiskPool/0": - pool_types = 5 + pool_types = 6 return exp_base_num * pool_types if virt == 'Xen' or virt == 'XenFV': @@ -363,8 +363,9 @@ if rev >= net_rasd_template_changes: dev_types = 2 + net_types = 2
- return exp_base_num * dev_types + return exp_base_num * dev_types * net_types
def get_exp_template_rasd_len(virt, ip, id): curr_cim_rev, changeset = get_provider_version(virt, ip)
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim
-- Thanks and Regards, Deepti B. Kalakeri IBM Linux Technology Center deeptik@linux.vnet.ibm.com
participants (2)
-
Deepti B Kalakeri -
Kaitlin Rupert