- CIM - libvirt List Archives

[PATCH] [TEST] #2 Adding new tc to verify the template RASDs for parent DiskPoolRASD
by Deepti B. Kalakeri 22 May '09

22 May '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1242974489 25200 # Node ID c2fb325da0413f33ea9b893f29ace6caed8a24b1 # Parent e5fd77170913c3819d667e240c9873efa3bf0d07 [TEST] #2 Adding new tc to verify the template RASDs for parent DiskPoolRASD Tested with KVM on F10 with current sources. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r e5fd77170913 -r c2fb325da041 suites/libvirt-cim/cimtest/RASD/07_parent_disk_pool.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/RASD/07_parent_disk_pool.py Thu May 21 23:41:29 2009 -0700 @@ -0,0 +1,114 @@ +#!/usr/bin/python +# +# Copyright 2009 IBM Corp. +# +# Authors: +# Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +# This test case is used to verify the Parent DiskPoolRASD properties +# in detail using the SettingsDefineCapabilities association. +# +# Ex: +# Command: +# wbemcli ai -ac SettingsDefineCapabilities \ +# 'http://localhost:5988/root/virt:KVM_AllocationCapabilties.InstanceID=\ +# "DiskPool/0"' +# +# Output: +# localhost/root/virt:KVM_DiskPoolResourceAllocationSettingData.\ +# InstanceID="Increment" +# -InstanceID="Default" [ verified for Minimum, Maximum, Increment as well ] +# -ResourceType=17 +# -PoolID="DiskPool/0" +# -Type=3 [ For Type 1 and 2 as well ] +# -Path="/dev/null" +# -DevicePath= +# -Host="host_sys.domain.com" +# -SourceDirectory="/var/lib/images" +# +# Date : 21-05-2009 + +import sys +from sets import Set +from CimTest.Globals import logger +from XenKvmLib.const import do_main +from CimTest.ReturnCodes import PASS, FAIL +from XenKvmLib.pool import get_pool_rasds + +sup_types = ['KVM', 'Xen', 'XenFV'] +DISKPOOL_REC_LEN = 3 + +def get_rec(diskpool_rasd, inst_id='Default'): + recs = [] + for dp_rasd in diskpool_rasd: + if dp_rasd['InstanceID'] == inst_id : + recs.append(dp_rasd) + return recs + +@do_main(sup_types) +def main(): + options = main.options + virt = options.virt + server = options.ip + diskpool_rasd = get_pool_rasds(server, virt, pool_type="DiskPool", + filter_default=False) + inst_list = [ 'Default', 'Minimum', 'Maximum', 'Increment' ] + n_rec_val = { 'ResourceType' : 17, + 'PoolID' : "DiskPool/0", + 'Path' : "/dev/null", + } + exp_type_path_host_dir = [('1', 'None', 'None', 'None'), + ('2', '/dev/sda100', 'None', 'None'), + ('3', 'None', 'host_sys.domain.com', + '/var/lib/images')] + + + for inst_type in inst_list: + logger.info("Verifying '%s' records", inst_type) + + try: + n_rec = get_rec(diskpool_rasd, inst_id=inst_type) + if len(n_rec) != DISKPOOL_REC_LEN: + raise Exception("Got %s recs instead of %s" %(len(n_rec), + DISKPOOL_REC_LEN)) + + res_type_path_host_dir = [] + for rec in n_rec: + l = (str(rec['Type']), str(rec['DevicePath']), + str(rec['Host']), str(rec['SourceDirectory'])) + res_type_path_host_dir.append(l) + + if len(Set(exp_type_path_host_dir) & Set(res_type_path_host_dir)) \ + != DISKPOOL_REC_LEN : + raise Exception("Mismatching values, \nGot %s,\nExpected %s"\ + %(exp_type_path_host_dir, + res_type_path_host_dir)) + + for key in n_rec_val.keys(): + for rec in n_rec: + if n_rec_val[key] != rec[key]: + raise Exception("'%s' Mismatch, Got %s, Expected %s" \ + % (key, rec[key], n_rec_val[key])) + + except Exception, details: + logger.error("Exception details: %s", details) + return FAIL + + return PASS +if __name__ == "__main__": + sys.exit(main())

1 0

[PATCH] [TEST] Adding new tc to verify the template RASDs for parent DiskPoolRASD
by Deepti B. Kalakeri 21 May '09

21 May '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1242904299 25200 # Node ID b88e452523d773787c9ea2e4b46505fd9df5ba76 # Parent 835ba5d083c620046dc16c29e1bf44932af759a7 [TEST] Adding new tc to verify the template RASDs for parent DiskPoolRASD Tested with KVM on F10 with current sources. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 835ba5d083c6 -r b88e452523d7 suites/libvirt-cim/cimtest/RASD/07_parent_disk_pool.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/RASD/07_parent_disk_pool.py Thu May 21 04:11:39 2009 -0700 @@ -0,0 +1,112 @@ +#!/usr/bin/python +# +# Copyright 2009 IBM Corp. +# +# Authors: +# Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +# This test case is used to verify the Parent DiskPoolRASD properties +# in detail using the SettingsDefineCapabilities association. +# +# Ex: +# Command: +# wbemcli ai -ac SettingsDefineCapabilities \ +# 'http://localhost:5988/root/virt:KVM_AllocationCapabilties.InstanceID=\ +# "DiskPool/0"' +# +# Output: +# localhost/root/virt:KVM_DiskPoolResourceAllocationSettingData.InstanceID="Increment" +# -InstanceID="Default" [ verified for Minimum, Maximum, Increment as well ] +# -ResourceType=17 +# -PoolID="DiskPool/0" +# -Type=3 [ For Type 1 and 2 as well ] +# -Path="/dev/null" +# -DevicePath= +# -Host="host_sys.domain.com" +# -SourceDirectory="/var/lib/images" +# +# Date : 21-05-2009 + +import sys +from sets import Set +from CimTest.Globals import logger +from XenKvmLib.const import do_main +from CimTest.ReturnCodes import PASS, FAIL +from XenKvmLib.pool import get_pool_rasds + +sup_types = ['KVM', 'Xen', 'XenFV'] + +def get_rec(netpool_rasd, inst_id='Default'): + recs = [] + for np_rasd in netpool_rasd: + if np_rasd['InstanceID'] == inst_id : + recs.append(np_rasd) + return recs + +@do_main(sup_types) +def main(): + options = main.options + virt = options.virt + server = options.ip + status = FAIL + netpool_rasd = get_pool_rasds(server, virt, pool_type="DiskPool", + filter_default=False) + inst_list = [ 'Default', 'Minimum', 'Maximum', 'Increment' ] + n_rec_val = { 'ResourceType' : 17, + 'PoolID' : "DiskPool/0", + 'Path' : "/dev/null", + } + exp_type_path_host_dir = [('1', 'None', 'None', 'None'), + ('2', '/dev/sda100', 'None', 'None'), + ('3', 'None', 'host_sys.domain.com', + '/var/lib/images')] + + + for inst_type in inst_list: + logger.info("Verifying '%s' records", inst_type) + + try: + n_rec = get_rec(netpool_rasd, inst_id=inst_type) + if len(n_rec) != 3: + raise Exception("Got %s recs instead of 3" %(len(n_rec))) + + res_type_path_host_dir = [] + for rec in n_rec: + l = (str(rec['Type']), str(rec['DevicePath']), + str(rec['Host']), str(rec['SourceDirectory'])) + res_type_path_host_dir.append(l) + + if len(Set(exp_type_path_host_dir) & Set(res_type_path_host_dir)) != 3 : + raise Exception("Mismatching values, " \ + "\nGot %s, \nExpected %s" \ + %(exp_type_path_host_dir, \ + res_type_path_host_dir)) + + for key in n_rec_val.keys(): + for rec in n_rec: + if n_rec_val[key] != rec[key]: + raise Exception("'%s' Mismatch, Got %s, Expected %s" \ + % (key, rec[key], n_rec_val[key])) + + except Exception, details: + logger.error("Exception details: %s", details) + return FAIL + + return PASS +if __name__ == "__main__": + sys.exit(main())

2 1

[PATCH] [TEST] Return SKIP if the provider version doesn't support template pool RASDs
by Kaitlin Rupert 21 May '09

21 May '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1242936560 25200 # Node ID 4467ea28368f7343c89990e7179170be34c08c6f # Parent 835ba5d083c620046dc16c29e1bf44932af759a7 [TEST] Return SKIP if the provider version doesn't support template pool RASDs Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 835ba5d083c6 -r 4467ea28368f suites/libvirt-cim/cimtest/RASD/06_parent_net_pool.py --- a/suites/libvirt-cim/cimtest/RASD/06_parent_net_pool.py Wed May 20 03:27:45 2009 -0700 +++ b/suites/libvirt-cim/cimtest/RASD/06_parent_net_pool.py Thu May 21 13:09:20 2009 -0700 @@ -68,7 +68,10 @@ virt = options.virt server = options.ip status = FAIL - netpool_rasd = get_pool_rasds(server, virt, filter_default=False) + status, netpool_rasd = get_pool_rasds(server, virt, filter_default=False) + if status != PASS: + return status + inst_list = [ 'Default', 'Minimum', 'Maximum', 'Increment' ] n_rec_val = { 'ResourceType' : 10, 'PoolID' : "NetworkPool/0", diff -r 835ba5d083c6 -r 4467ea28368f suites/libvirt-cim/lib/XenKvmLib/pool.py --- a/suites/libvirt-cim/lib/XenKvmLib/pool.py Wed May 20 03:27:45 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/pool.py Thu May 21 13:09:20 2009 -0700 @@ -22,7 +22,7 @@ import sys from CimTest.Globals import logger, CIM_NS -from CimTest.ReturnCodes import PASS, FAIL +from CimTest.ReturnCodes import PASS, FAIL, SKIP from XenKvmLib.classes import get_typed_class, inst_to_mof from XenKvmLib.const import get_provider_version, default_pool_name from XenKvmLib.enumclass import EnumInstances, GetInstance @@ -108,6 +108,22 @@ def get_pool_rasds(server, virt, pool_type="NetworkPool", filter_default=True): + + net_pool_rasd_rev = 867 + disk_pool_rasd_rev = 863 + + try: + rev, changeset = get_provider_version(virt, server) + if pool_type == "NetworkPool" and rev < net_pool_rasd_rev: + raise Exception("Supported in version %d" % net_pool_rasd_rev) + + if pool_type == "DiskPool" and rev < disk_pool_rasd_rev: + raise Exception("Supported in version %d" % disk_pool_rasd_rev) + + except Exception, detail: + logger.error("%s template RASDs not supported. %s.", pool_type, detail) + return SKIP, None + net_pool_rasds = [] ac_cn = get_typed_class(virt, "AllocationCapabilities") @@ -119,16 +135,16 @@ rasd = Associators(server, an_cn, ac_cn, InstanceID=inst.InstanceID) except Exception, detail: logger.error("Exception: %s", detail) - return None + return FAIL, None if filter_default == True: for item in rasd: if item['InstanceID'] == "Default": net_pool_rasds.append(item) else: - return rasd + return PASS, rasd - return net_pool_rasds + return PASS, net_pool_rasds def net_undefine(network, server, virt="Xen"): """Function undefine a given virtual network""" @@ -177,8 +193,8 @@ logger.error("IP address is in use by a different network") return FAIL - net_pool_rasds = get_pool_rasds(server, virt) - if len(net_pool_rasds) == 0: + status, net_pool_rasds = get_pool_rasds(server, virt) + if len(net_pool_rasds) == 0 or status != PASS: logger.error("We can not get NetPoolRASDs") return FAIL else:

1 0

What does NumberOfBlocks and ConsumableBlocks in the Xen_Memory class represent?
by Medlyn, Dayne (VSL - Ft Collins) 21 May '09

21 May '09

All, I am trying to understand the use of NumberOfBlocks and ConsumableBlocks in the Xen_Memory class, specifically for the Xen host. What I have noticed is that between libvirt-cim-0.4.1 and libvirt-cim-0.5.2 the values for NumberOfBlock is now different than ConsumableBlocks and much larger than the physical memory installed on the system. Is it the case that NumberOfBlocks represents the maximum possible blocks for the hardware, or some such number ConsumableBlocks is the memory that is actually installed in the system? On my system, however, NumberOfBlocks reports 16TB where /proc/meminfo reports 32Tb for VmallocTotal. In short, should I be using ConsumableBlocks to determine the total physical memory on the system? Thanks for your help. Dayne

2 14

[PATCH] [TEST] Removed the unused status and return statement
by Deepti B. Kalakeri 21 May '09

21 May '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1242904875 25200 # Node ID 9b2b34f16bd6f04af4b3b8909e258a6a8f168b03 # Parent b88e452523d773787c9ea2e4b46505fd9df5ba76 [TEST] Removed the unused status and return statement. Tested with KVM on F10 with current sources. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r b88e452523d7 -r 9b2b34f16bd6 suites/libvirt-cim/cimtest/RASD/06_parent_net_pool.py --- a/suites/libvirt-cim/cimtest/RASD/06_parent_net_pool.py Thu May 21 04:11:39 2009 -0700 +++ b/suites/libvirt-cim/cimtest/RASD/06_parent_net_pool.py Thu May 21 04:21:15 2009 -0700 @@ -67,7 +67,6 @@ options = main.options virt = options.virt server = options.ip - status = FAIL netpool_rasd = get_pool_rasds(server, virt, filter_default=False) inst_list = [ 'Default', 'Minimum', 'Maximum', 'Increment' ] n_rec_val = { 'ResourceType' : 10, @@ -110,7 +109,5 @@ return PASS - - return status if __name__ == "__main__": sys.exit(main())

1 0

[PATCH 0 of 2] [TEST] Add test to verifyCreateSnapshot()
by Kaitlin Rupert 20 May '09

20 May '09

The necessary libvit-cim changes are now upstream. So this is ready to test.

2 3

[PATCH 0 of 2] Adding new tc to verify the template RASDs for parent NetPoolRASD.
by Deepti B. Kalakeri 20 May '09

20 May '09

1 2

[PATCH] Update SAE to use the proper association attributes
by Kaitlin Rupert 20 May '09

20 May '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1242689960 25200 # Node ID 61b3f36a8a0294c916b778774e58319fbf24b4b5 # Parent 853db606f335086710612450a93bfd67c1293922 Update SAE to use the proper association attributes Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 853db606f335 -r 61b3f36a8a02 src/Virt_ServiceAffectsElement.c --- a/src/Virt_ServiceAffectsElement.c Mon May 18 16:39:18 2009 -0700 +++ b/src/Virt_ServiceAffectsElement.c Mon May 18 16:39:20 2009 -0700 @@ -136,7 +136,7 @@ LIBVIRT_CIM_DEFAULT_MAKEREF() -static char* antecedent[] = { +static char* affected_ele[] = { "Xen_ComputerSystem", "KVM_ComputerSystem", "LXC_ComputerSystem", @@ -149,7 +149,7 @@ NULL }; -static char* dependent[] = { +static char* affecting_ele[] = { "Xen_ConsoleRedirectionService", "KVM_ConsoleRedirectionService", "LXC_ConsoleRedirectionService", @@ -164,11 +164,11 @@ }; static struct std_assoc _cs_to_service = { - .source_class = (char**)&antecedent, - .source_prop = "Antecedent", + .source_class = (char**)&affected_ele, + .source_prop = "AffectedElement", - .target_class = (char**)&dependent, - .target_prop = "Dependent", + .target_class = (char**)&affecting_ele, + .target_prop = "AffectingElement", .assoc_class = (char**)&assoc_classname, @@ -177,11 +177,11 @@ }; static struct std_assoc _service_to_cs = { - .source_class = (char**)&dependent, - .source_prop = "Dependent", + .source_class = (char**)&affecting_ele, + .source_prop = "AffectingElement", - .target_class = (char**)&antecedent, - .target_prop = "Antecedent", + .target_class = (char**)&affected_ele, + .target_prop = "AffectedElement", .assoc_class = (char**)&assoc_classname,

2 1

[PATCH 0 of 5] Migrate from scheam 2.16 to 2.21
by Kaitlin Rupert 20 May '09

20 May '09

This patchset provides the set of changes needed to upgrade to scheam 2.21. The easiest way to test this is to do the following: 1) make preuninstall 2) make uninstall 3) Recongifure your source tree to pick up the makefile changes 5) make 6) make preinstall 7) Restart your CIMOM (to be sure to pick up the new schema) 8) make install 9) make postinstall I've also testing this by uninstalling Pegasus / sfcb and removing the repository. Then reinstalling Pegasus / sfcb and doing the steps above.

2 6

[PATCH 0 of 2] Adding new tc to verify the template RASDs for parent NetPoolRASD.
by Deepti B. Kalakeri 20 May '09

20 May '09

2 3