[PATCH] Add AC classnames to host_caps struct in EC
by Kaitlin Rupert
# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1224606148 25200
# Node ID e7ffee5deb372f73fa3f315bffca69e6b21fe5b8
# Parent 749adf090de64e8fb7932d71cf16f268b22b2bec
Add AC classnames to host_caps struct in EC.
The sys_to_cap() function also returns AC instances. The classnames are needed
so that queries using the result class don't filter out the AC instances.
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r 749adf090de6 -r e7ffee5deb37 src/Virt_ElementCapabilities.c
--- a/src/Virt_ElementCapabilities.c Mon Oct 20 21:26:09 2008 -0700
+++ b/src/Virt_ElementCapabilities.c Tue Oct 21 09:22:28 2008 -0700
@@ -398,6 +398,9 @@
"KVM_VirtualSystemMigrationCapabilities",
"LXC_VirtualSystemManagementCapabilities",
"LXC_VirtualSystemMigrationCapabilities",
+ "Xen_AllocationCapabilities",
+ "KVM_AllocationCapabilities",
+ "LXC_AllocationCapabilities",
NULL,
};
16 years, 2 months
- 1
- 0
[PATCH] [TEST] Updating the tc to use cim_define()
by Deepti B. Kalakeri
# HG changeset patch
# User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
# Date 1224577871 25200
# Node ID c1ab00fe5a8fbc2483d4baa2eb436d9842f311be
# Parent f35b3e65944d83f758656717a903eee38b7d5b19
[TEST] Updating the tc to use cim_define().
Tested with Xen, XenFV, KVM with current sources without sblim-base-provider.
Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Sun Oct 19 19:28:33 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Tue Oct 21 01:31:11 2008 -0700
@@ -44,7 +44,7 @@ def main():
status = FAIL
cxml = vxml.get_class(options.virt)(test_dom)
- rc = cxml.define(options.ip)
+ rc = cxml.cim_define(options.ip)
if not rc:
Globals.logger.error(VIRSH_ERROR_DEFINE % test_dom)
return status
diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Sun Oct 19 19:28:33 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Tue Oct 21 01:31:11 2008 -0700
@@ -69,7 +69,7 @@ def main():
#Define a VS
try:
- ret = cxml.define(options.ip)
+ ret = cxml.cim_define(options.ip)
if not ret :
logger.error("ERROR: VS %s was not defined" % test_dom)
return status
diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py
--- a/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py Sun Oct 19 19:28:33 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py Tue Oct 21 01:31:11 2008 -0700
@@ -135,7 +135,7 @@ def main():
keys['DiskResourceAllocationSettingData'] = "%s/%s" % (test_dom, vdisk)
keys['NetResourceAllocationSettingData'] = "%s/%s" % (test_dom, vmac)
- ret = cxml.define(options.ip)
+ ret = cxml.cim_define(options.ip)
if not ret:
logger.error("Failed to define the dom: %s", test_dom)
return FAIL
diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
--- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Sun Oct 19 19:28:33 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Tue Oct 21 01:31:11 2008 -0700
@@ -85,7 +85,7 @@ def setup_env(server, virt="Xen"):
mac = test_mac,
disk = test_disk)
- ret = vsxml_info.define(server)
+ ret = vsxml_info.cim_define(server)
if not ret:
logger.error("Failed to define the dom: %s", test_dom)
status = FAIL
diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py
--- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Sun Oct 19 19:28:33 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Tue Oct 21 01:31:11 2008 -0700
@@ -225,7 +225,7 @@ def main():
vsxml = virt_type(test_dom, vcpus = test_vcpus, mac = test_mac,
disk = test_disk, ntype="network")
- ret = vsxml.define(server)
+ ret = vsxml.cim_define(server)
if not ret:
logger.error("Failed to define the dom: '%s'", test_dom)
return FAIL
diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py
--- a/suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py Sun Oct 19 19:28:33 2008 -0700
+++ b/suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py Tue Oct 21 01:31:11 2008 -0700
@@ -45,7 +45,7 @@ def main():
test_dev = 'hda'
vsxml = get_class(options.virt)(test_dom, disk=test_dev)
- vsxml.define(options.ip)
+ vsxml.cim_define(options.ip)
devid = "%s/%s" % (test_dom, test_dev)
key_list = { 'DeviceID' : devid,
16 years, 2 months
- 1
- 0
[PATCH] [TEST] Fixing false positive and modifying the tc to use ProcRASD to verify the guest info
by Deepti B. Kalakeri
# HG changeset patch
# User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
# Date 1224586274 25200
# Node ID 8bcff8eaa5a2fc302d81df5791547bf510a9afb9
# Parent c1ab00fe5a8fbc2483d4baa2eb436d9842f311be
[TEST] Fixing false positive and modifying the tc to use ProcRASD to verify the guest info.
1) The tc was returning a false positive for KVM since it was verifying the CPU values only for Xen and XenFV.
2) Used GetInstance on ProcRASD instead of virsh schedinfo to verify the weight and Limit values of the domain.
Tested with Xen, XenFV, KVM with current sources, without sblim-base-provider.
Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
diff -r c1ab00fe5a8f -r 8bcff8eaa5a2 suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py Tue Oct 21 01:31:11 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py Tue Oct 21 03:51:14 2008 -0700
@@ -25,6 +25,8 @@ from XenKvmLib.common_util import call_r
from XenKvmLib.common_util import call_request_state_change, \
poll_for_state_change
from XenKvmLib import vsms
+from XenKvmLib.enumclass import GetInstance
+from XenKvmLib.common_util import get_typed_class
from VirtLib import utils
from CimTest.Globals import logger
from XenKvmLib.const import do_main
@@ -55,38 +57,23 @@ def setup_rasd_mof(ip, vtype):
return FAIL, vssd, rasd
-def check_sched_info(str, exp_val, server, virt):
- if str == "limit":
- virsh_val = "cap"
- else:
- virsh_val = str
+def check_proc_sched(server, virt):
+ try:
+ key_list = {"InstanceID" : '%s/proc' %default_dom}
+ cn_name = get_typed_class(virt, 'ProcResourceAllocationSettingData')
+ proc = GetInstance(server, cn_name, key_list)
+
+ if proc.Limit != limit:
+ logger.error("Limit is %i, expected %i", proc.Limit, limit)
+ return FAIL
- cmd = "virsh -c %s schedinfo %s | awk '/%s/ { print \$3 }'" % \
- (utils.virt2uri(virt), default_dom, virsh_val)
- ret, out = utils.run_remote(server, cmd)
- if not out.isdigit():
+ if proc.Weight != weight:
+ logger.error("Weight is %i, expected %i", proc.Weight, weight)
+ return FAIL
+
+ except Exception, details:
+ logger.error("Exception: details %s", details)
return FAIL
-
- try:
- val = int(out)
- except ValueError:
- val = -1
-
- if val != exp_val:
- logger.error("%s is %i, expected %i" % (str, val, exp_val))
- return FAIL
-
- return PASS
-
-def check_proc_sched(server, virt):
- attr_list = { "weight" : weight,
- "limit" : limit
- }
-
- for k, v in attr_list.iteritems():
- status = check_sched_info(k, v, server, virt)
- if status != PASS:
- return FAIL
return PASS
@@ -100,7 +87,6 @@ def main():
try:
service = vsms.get_vsms_class(options.virt)(options.ip)
-
service.DefineSystem(SystemSettings=vssd,
ResourceSettings=rasd,
ReferenceConfiguration=' ')
@@ -116,16 +102,14 @@ def main():
if status != PASS:
raise Exception("%s didn't change state as expected" % default_dom)
- if options.virt == "Xen" or options.virt == "XenFV":
- status = check_proc_sched(options.ip, options.virt)
- if status != PASS:
- raise Exception("%s CPU scheduling not set properly" %
- default_dom)
+ status = check_proc_sched(options.ip, options.virt)
+ if status != PASS:
+ raise Exception("%s CPU scheduling not set properly", default_dom)
status = PASS
except Exception, details:
- logger.error(details)
+ logger.error("Exception: details %s", details)
status = FAIL
destroy_and_undefine_domain(default_dom, options.ip, options.virt)
16 years, 2 months
- 1
- 0
[PATCH] [TEST] Updating the tc to use cim_define()
by Deepti B. Kalakeri
# HG changeset patch
# User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
# Date 1224577871 25200
# Node ID c1ab00fe5a8fbc2483d4baa2eb436d9842f311be
# Parent f35b3e65944d83f758656717a903eee38b7d5b19
[TEST] Updating the tc to use cim_define().
Tested with Xen, XenFV, KVM with current sources without sblim-base-provider.
Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Sun Oct 19 19:28:33 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Tue Oct 21 01:31:11 2008 -0700
@@ -44,7 +44,7 @@ def main():
status = FAIL
cxml = vxml.get_class(options.virt)(test_dom)
- rc = cxml.define(options.ip)
+ rc = cxml.cim_define(options.ip)
if not rc:
Globals.logger.error(VIRSH_ERROR_DEFINE % test_dom)
return status
diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Sun Oct 19 19:28:33 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Tue Oct 21 01:31:11 2008 -0700
@@ -69,7 +69,7 @@ def main():
#Define a VS
try:
- ret = cxml.define(options.ip)
+ ret = cxml.cim_define(options.ip)
if not ret :
logger.error("ERROR: VS %s was not defined" % test_dom)
return status
diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py
--- a/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py Sun Oct 19 19:28:33 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py Tue Oct 21 01:31:11 2008 -0700
@@ -135,7 +135,7 @@ def main():
keys['DiskResourceAllocationSettingData'] = "%s/%s" % (test_dom, vdisk)
keys['NetResourceAllocationSettingData'] = "%s/%s" % (test_dom, vmac)
- ret = cxml.define(options.ip)
+ ret = cxml.cim_define(options.ip)
if not ret:
logger.error("Failed to define the dom: %s", test_dom)
return FAIL
diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
--- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Sun Oct 19 19:28:33 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Tue Oct 21 01:31:11 2008 -0700
@@ -85,7 +85,7 @@ def setup_env(server, virt="Xen"):
mac = test_mac,
disk = test_disk)
- ret = vsxml_info.define(server)
+ ret = vsxml_info.cim_define(server)
if not ret:
logger.error("Failed to define the dom: %s", test_dom)
status = FAIL
diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py
--- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Sun Oct 19 19:28:33 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Tue Oct 21 01:31:11 2008 -0700
@@ -225,7 +225,7 @@ def main():
vsxml = virt_type(test_dom, vcpus = test_vcpus, mac = test_mac,
disk = test_disk, ntype="network")
- ret = vsxml.define(server)
+ ret = vsxml.cim_define(server)
if not ret:
logger.error("Failed to define the dom: '%s'", test_dom)
return FAIL
diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py
--- a/suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py Sun Oct 19 19:28:33 2008 -0700
+++ b/suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py Tue Oct 21 01:31:11 2008 -0700
@@ -45,7 +45,7 @@ def main():
test_dev = 'hda'
vsxml = get_class(options.virt)(test_dom, disk=test_dev)
- vsxml.define(options.ip)
+ vsxml.cim_define(options.ip)
devid = "%s/%s" % (test_dom, test_dev)
key_list = { 'DeviceID' : devid,
16 years, 2 months
- 1
- 0
[PATCH] Add cu_validate_ref() to get_alloc_cap_by_id(), fix alloc_cap_to_rasd()
by Kaitlin Rupert
# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1224563169 25200
# Node ID 749adf090de64e8fb7932d71cf16f268b22b2bec
# Parent c41bd7c3175a970f7c674931ee27ef2a88b63b61
Add cu_validate_ref() to get_alloc_cap_by_id(), fix alloc_cap_to_rasd()...
To call get_alloc_cap_by_id().
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r c41bd7c3175a -r 749adf090de6 src/Makefile.am
--- a/src/Makefile.am Mon Oct 20 18:40:45 2008 -0700
+++ b/src/Makefile.am Mon Oct 20 21:26:09 2008 -0700
@@ -120,7 +120,7 @@
libVirt_AllocationCapabilities_la_SOURCES = Virt_AllocationCapabilities.c
libVirt_AllocationCapabilities_la_LIBADD = -lVirt_DevicePool
-libVirt_ElementCapabilities_la_DEPENDENCIES = libVirt_VirtualSystemManagementCapabilities.la libVirt_EnabledLogicalElementCapabilities.la libVirt_ComputerSystem.la libVirt_HostSystem.la libVirt_VSMigrationCapabilities.la libVirt_VirtualSystemManagementService.la libVirt_VSMigrationService.la libVirt_DevicePool.la
+libVirt_ElementCapabilities_la_DEPENDENCIES = libVirt_VirtualSystemManagementCapabilities.la libVirt_EnabledLogicalElementCapabilities.la libVirt_ComputerSystem.la libVirt_HostSystem.la libVirt_VSMigrationCapabilities.la libVirt_VirtualSystemManagementService.la libVirt_VSMigrationService.la libVirt_DevicePool.la libVirt_AllocationCapabilities.la
libVirt_ElementCapabilities_la_SOURCES = Virt_ElementCapabilities.c
libVirt_ElementCapabilities_la_LIBADD = -lVirt_VirtualSystemManagementCapabilities \
-lVirt_EnabledLogicalElementCapabilities \
@@ -132,12 +132,13 @@
-lVirt_VSMigrationService \
-lVirt_DevicePool
-libVirt_SettingsDefineCapabilities_la_DEPENDENCIES = libVirt_RASD.la libVirt_DevicePool.la libVirt_VSMigrationCapabilities.la libVirt_VSMigrationSettingData.la
+libVirt_SettingsDefineCapabilities_la_DEPENDENCIES = libVirt_RASD.la libVirt_DevicePool.la libVirt_VSMigrationCapabilities.la libVirt_VSMigrationSettingData.la libVirt_AllocationCapabilities.la
libVirt_SettingsDefineCapabilities_la_SOURCES = Virt_SettingsDefineCapabilities.c
libVirt_SettingsDefineCapabilities_la_LIBADD = -lVirt_RASD \
-lVirt_DevicePool \
-lVirt_VSMigrationCapabilities \
- -lVirt_VSMigrationSettingData
+ -lVirt_VSMigrationSettingData \
+ -lVirt_AllocationCapabilities
libVirt_RegisteredProfile_la_SOURCES = Virt_RegisteredProfile.c
diff -r c41bd7c3175a -r 749adf090de6 src/Virt_AllocationCapabilities.c
--- a/src/Virt_AllocationCapabilities.c Mon Oct 20 18:40:45 2008 -0700
+++ b/src/Virt_AllocationCapabilities.c Mon Oct 20 21:26:09 2008 -0700
@@ -159,7 +159,11 @@
if ((pool == NULL) || (s.rc != CMPI_RC_OK))
return s;
- return ac_from_pool(broker, ref, pool, inst);
+ s = ac_from_pool(broker, ref, pool, inst);
+ if (s.rc != CMPI_RC_OK)
+ return s;
+
+ return cu_validate_ref(broker, ref, *inst);
}
static CMPIStatus return_alloc_cap_instances(const CMPIBroker *broker,
diff -r c41bd7c3175a -r 749adf090de6 src/Virt_SettingsDefineCapabilities.c
--- a/src/Virt_SettingsDefineCapabilities.c Mon Oct 20 18:40:45 2008 -0700
+++ b/src/Virt_SettingsDefineCapabilities.c Mon Oct 20 21:26:09 2008 -0700
@@ -47,6 +47,7 @@
#include "Virt_VSMigrationCapabilities.h"
#include "Virt_VSMigrationSettingData.h"
#include "Virt_VirtualSystemManagementService.h"
+#include "Virt_AllocationCapabilities.h"
const static CMPIBroker *_BROKER;
@@ -730,6 +731,7 @@
struct inst_list *list)
{
CMPIStatus s = {CMPI_RC_OK};
+ CMPIInstance *inst;
uint16_t type;
const char *id = NULL;
int i;
@@ -743,6 +745,10 @@
"Missing InstanceID");
goto out;
}
+
+ s = get_alloc_cap_by_id(_BROKER, ref, id, &inst);
+ if ((inst == NULL) || (s.rc != CMPI_RC_OK))
+ goto out;
type = res_type_from_pool_id(id);
16 years, 2 months
- 1
- 0
[PATCH] [TEST] Remove old enumerate* and getInstance in enumclass.py and device.py
by yunguol＠cn.ibm.com
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1224470389 25200
# Node ID b87d80615bb3765161d2295e3cefc14c4152fdf2
# Parent a3d9c0a81c27471418993b7c8f907f0b95f79e63
[TEST] Remove old enumerate* and getInstance in enumclass.py and device.py
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r a3d9c0a81c27 -r b87d80615bb3 suites/libvirt-cim/lib/XenKvmLib/devices.py
--- a/suites/libvirt-cim/lib/XenKvmLib/devices.py Wed Oct 15 19:13:10 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/devices.py Sun Oct 19 19:39:49 2008 -0700
@@ -101,36 +101,6 @@ def get_class(classname):
def get_class(classname):
return eval(classname)
-def enumerate(server, basetype, keys, virt='Xen'):
- conn = pywbem.WBEMConnection('http://%s' % server,
- (Globals.CIM_USER, Globals.CIM_PASS),
- Globals.CIM_NS)
-
- list = []
-
- #FIXME - Remove once all tests are converted for KVM
- basetype = basetype.split('_', 1)[-1]
-
- devtype = eval(get_typed_class(virt, basetype))
- try:
- names = conn.EnumerateInstanceNames(devtype.__name__)
- except pywbem.CIMError, arg:
- raise Exception("%s" % arg[1])
- return list
-
- for name in names:
- key_list = {}
- for item in keys:
- key_list[item] = name.keybindings[item]
-
- if len(key_list) == 0:
- return list
-
- list.append(devtype(server, key_list))
-
- return list
-
-
def device_of(server, key_list):
t = eval(key_list["CreationClassName"])
diff -r a3d9c0a81c27 -r b87d80615bb3 suites/libvirt-cim/lib/XenKvmLib/enumclass.py
--- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Wed Oct 15 19:13:10 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Sun Oct 19 19:39:49 2008 -0700
@@ -363,69 +363,6 @@ class LXC_VirtualSystemManagementService
# ex: Xen_RegisteredProfile
# keyname = The keyvalue
# ex: InstanceID in case of Xen_RegisteredProfile
-def enumerate_inst(server, classname, virt="Xen"):
- classname = "%s" % classname
- new_classname = classname.split('_')
- if len(new_classname) == 2:
- classname = new_classname[1]
- classname = eval(get_typed_class(virt, classname))
- instances = []
- conn = pywbem.WBEMConnection('http://%s' % server,
- (Globals.CIM_USER, Globals.CIM_PASS),
- Globals.CIM_NS)
-
- try:
- instances = conn.EnumerateInstances(classname.__name__)
- except pywbem.CIMError, arg:
- print arg[1]
- return []
-
- return instances
-
-def enumerate(server, basename, keys, virt="Xen"):
- #FIXME - Remove once all tests are converted for KVM
- basename = "%s" % basename
- new_base = basename.split('_')
- if len(new_base) == 2:
- basename = new_base[1]
-
- classname = eval(get_typed_class(virt, basename))
- instances = enumerate_inst(server, classname, virt)
-
- list = []
-
- for instance in instances:
- key_list = {}
- for item in keys:
- key_list[item] = instance[item]
-
- if len(key_list) == 0:
- return list
-
- list.append(classname(server, key_list))
-
- return list
-
-def getInstance(server, basename, keys, virt="Xen"):
- conn = pywbem.WBEMConnection('http://%s' % server,
- (Globals.CIM_USER, Globals.CIM_PASS),
- Globals.CIM_NS)
-
- #FIXME - Remove once all tests are converted for KVM
- basename = "%s" % basename
- new_base = basename.split('_')
- if len(new_base) == 2:
- basename = new_base[1]
-
- classname = eval(get_typed_class(virt, basename))
- try:
- inst = classname(server, keys)
-
- except pywbem.CIMError, arg:
- print arg[1]
- return None
-
- return inst
class CIM_CimtestClass(CIM_Instance):
def __init__(self, host, ref):
16 years, 2 months
- 3
- 2
XenFV on Pegasus Test Run Summary for Oct 20 2008
by Deepti B Kalakeri
=================================================
XenFV on Pegasus Test Run Summary for Oct 20 2008
=================================================
Distro: Red Hat Enterprise Linux Server release 5.2 (Tikanga)
Kernel: 2.6.18-92.el5xen
libvirt: 0.3.3
Hypervisor: Xen 3.1.0
CIMOM: Pegasus 2.7.0
Libvirt-cim revision: 720
Libvirt-cim changeset: 0f39ab1ee830
=================================================
FAIL : 6
XFAIL : 0
SKIP : 4
PASS : 126
-----------------
Total : 136
=================================================
FAIL Test Summary:
ComputerSystem - 03_defineVS.py: FAIL
ElementSettingData - 01_forward.py: FAIL
HostSystem - 02_hostsystem_to_rasd.py: FAIL
HostSystem - 04_hs_to_EAPF.py: FAIL
LogicalDisk - 01_disk.py: FAIL
VirtualSystemManagementService - 09_procrasd_persist.py: FAIL
=================================================
SKIP Test Summary:
ComputerSystem - 02_nosystems.py: SKIP
LogicalDisk - 02_nodevs.py: SKIP
NetworkPort - 03_user_netport.py: SKIP
VSSD - 02_bootldr.py: SKIP
=================================================
Full report:
--------------------------------------------------------------------
AllocationCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
AllocationCapabilities - 02_alloccap_gi_errs.py: PASS
--------------------------------------------------------------------
ComputerSystem - 01_enum.py: PASS
--------------------------------------------------------------------
ComputerSystem - 02_nosystems.py: SKIP
--------------------------------------------------------------------
ComputerSystem - 03_defineVS.py: FAIL
ERROR - Failed to enumerate the class of Xen_ComputerSystem
ERROR - Exception: No defined domain (domU1) is found
ERROR - Error: property values are not set for VS domU1
--------------------------------------------------------------------
ComputerSystem - 04_defineStartVS.py: PASS
--------------------------------------------------------------------
ComputerSystem - 05_activate_defined_start.py: PASS
--------------------------------------------------------------------
ComputerSystem - 06_paused_active_suspend.py: PASS
--------------------------------------------------------------------
ComputerSystem - 22_define_suspend.py: PASS
--------------------------------------------------------------------
ComputerSystem - 23_suspend_suspend.py: PASS
--------------------------------------------------------------------
ComputerSystem - 27_define_suspend_errs.py: PASS
--------------------------------------------------------------------
ComputerSystem - 32_start_reboot.py: PASS
--------------------------------------------------------------------
ComputerSystem - 33_suspend_reboot.py: PASS
--------------------------------------------------------------------
ComputerSystem - 35_start_reset.py: PASS
--------------------------------------------------------------------
ComputerSystem - 40_RSC_start.py: PASS
--------------------------------------------------------------------
ComputerSystem - 41_cs_to_settingdefinestate.py: PASS
--------------------------------------------------------------------
ComputerSystem - 42_cs_gi_errs.py: PASS
--------------------------------------------------------------------
ComputerSystemIndication - 01_created_indication.py: PASS
--------------------------------------------------------------------
ElementAllocatedFromPool - 01_forward.py: PASS
--------------------------------------------------------------------
ElementAllocatedFromPool - 02_reverse.py: PASS
--------------------------------------------------------------------
ElementAllocatedFromPool - 03_reverse_errs.py: PASS
--------------------------------------------------------------------
ElementAllocatedFromPool - 04_forward_errs.py: PASS
--------------------------------------------------------------------
ElementCapabilities - 01_forward.py: PASS
--------------------------------------------------------------------
ElementCapabilities - 02_reverse.py: PASS
--------------------------------------------------------------------
ElementCapabilities - 03_forward_errs.py: PASS
--------------------------------------------------------------------
ElementCapabilities - 04_reverse_errs.py: PASS
--------------------------------------------------------------------
ElementCapabilities - 05_hostsystem_cap.py: PASS
--------------------------------------------------------------------
ElementConforms - 01_forward.py: PASS
--------------------------------------------------------------------
ElementConforms - 02_reverse.py: PASS
--------------------------------------------------------------------
ElementConforms - 03_ectp_fwd_errs.py: PASS
--------------------------------------------------------------------
ElementConforms - 04_ectp_rev_errs.py: PASS
--------------------------------------------------------------------
ElementSettingData - 01_forward.py: FAIL
ERROR - Expected at least one Xen_VirtualSystemSettingData instance
CIM_ERR_NOT_FOUND: No such instance (esd_dom)
--------------------------------------------------------------------
ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS
--------------------------------------------------------------------
EnabledLogicalElementCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS
--------------------------------------------------------------------
HostSystem - 01_enum.py: PASS
--------------------------------------------------------------------
HostSystem - 02_hostsystem_to_rasd.py: FAIL
ERROR - Xen_HostSystem with CrossClass_GuestDom was not returned
CIM_ERR_INVALID_CLASS: Linux_ComputerSystem
--------------------------------------------------------------------
HostSystem - 03_hs_to_settdefcap.py: PASS
--------------------------------------------------------------------
HostSystem - 04_hs_to_EAPF.py: FAIL
ERROR - DEBUG host_name is elm3b217.beaverton.ibm.com
ERROR - Xen_ElementAllocatedFromPool returned 0 Xen_DiskPool objects
CIM_ERR_INVALID_CLASS: Linux_ComputerSystem
--------------------------------------------------------------------
HostSystem - 05_hs_gi_errs.py: PASS
--------------------------------------------------------------------
HostSystem - 06_hs_to_vsms.py: PASS
--------------------------------------------------------------------
HostedDependency - 01_forward.py: PASS
--------------------------------------------------------------------
HostedDependency - 02_reverse.py: PASS
--------------------------------------------------------------------
HostedDependency - 03_enabledstate.py: PASS
--------------------------------------------------------------------
HostedDependency - 04_reverse_errs.py: PASS
--------------------------------------------------------------------
HostedResourcePool - 01_forward.py: PASS
--------------------------------------------------------------------
HostedResourcePool - 02_reverse.py: PASS
--------------------------------------------------------------------
HostedResourcePool - 03_forward_errs.py: PASS
--------------------------------------------------------------------
HostedResourcePool - 04_reverse_errs.py: PASS
--------------------------------------------------------------------
HostedService - 01_forward.py: PASS
--------------------------------------------------------------------
HostedService - 02_reverse.py: PASS
--------------------------------------------------------------------
HostedService - 03_forward_errs.py: PASS
--------------------------------------------------------------------
HostedService - 04_reverse_errs.py: PASS
--------------------------------------------------------------------
LogicalDisk - 01_disk.py: FAIL
ERROR - CIMError : (6, u'CIM_ERR_NOT_FOUND: No such instance (no domain for test_domain/hda)')
Traceback (most recent call last):
File "./lib/XenKvmLib/const.py", line 116, in do_try
File "01_disk.py", line 56, in main
dev = eval('devices.' + get_typed_class(options.virt, "LogicalDisk"))(options.ip, key_list)
File "./lib/XenKvmLib/devices.py", line 55, in __init__
CIMError: (6, u'CIM_ERR_NOT_FOUND: No such instance (no domain for test_domain/hda)')
ERROR - None
--------------------------------------------------------------------
LogicalDisk - 02_nodevs.py: SKIP
ERROR - System has defined domains; unable to run
--------------------------------------------------------------------
LogicalDisk - 03_ld_gi_errs.py: PASS
--------------------------------------------------------------------
Memory - 01_memory.py: PASS
--------------------------------------------------------------------
Memory - 02_defgetmem.py: PASS
--------------------------------------------------------------------
Memory - 03_mem_gi_errs.py: PASS
--------------------------------------------------------------------
NetworkPort - 01_netport.py: PASS
--------------------------------------------------------------------
NetworkPort - 02_np_gi_errors.py: PASS
--------------------------------------------------------------------
NetworkPort - 03_user_netport.py: SKIP
--------------------------------------------------------------------
Processor - 01_processor.py: PASS
--------------------------------------------------------------------
Processor - 02_definesys_get_procs.py: PASS
--------------------------------------------------------------------
Processor - 03_proc_gi_errs.py: PASS
--------------------------------------------------------------------
Profile - 01_enum.py: PASS
--------------------------------------------------------------------
Profile - 02_profile_to_elec.py: PASS
--------------------------------------------------------------------
Profile - 03_rprofile_gi_errs.py: PASS
--------------------------------------------------------------------
RASD - 01_verify_rasd_fields.py: PASS
--------------------------------------------------------------------
RASD - 02_enum.py: PASS
--------------------------------------------------------------------
RASD - 03_rasd_errs.py: PASS
--------------------------------------------------------------------
RASD - 04_disk_rasd_size.py: PASS
--------------------------------------------------------------------
ReferencedProfile - 01_verify_refprof.py: PASS
--------------------------------------------------------------------
ReferencedProfile - 02_refprofile_errs.py: PASS
--------------------------------------------------------------------
ResourceAllocationFromPool - 01_forward.py: PASS
--------------------------------------------------------------------
ResourceAllocationFromPool - 02_reverse.py: PASS
--------------------------------------------------------------------
ResourceAllocationFromPool - 03_forward_errs.py: PASS
--------------------------------------------------------------------
ResourceAllocationFromPool - 04_reverse_errs.py: PASS
--------------------------------------------------------------------
ResourceAllocationFromPool - 05_RAPF_err.py: PASS
--------------------------------------------------------------------
ResourcePool - 01_enum.py: PASS
--------------------------------------------------------------------
ResourcePool - 02_rp_gi_errors.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationService - 01_enum.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationService - 03_CreateResourcePool.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS
--------------------------------------------------------------------
SettingsDefine - 01_forward.py: PASS
--------------------------------------------------------------------
SettingsDefine - 02_reverse.py: PASS
--------------------------------------------------------------------
SettingsDefine - 03_sds_fwd_errs.py: PASS
--------------------------------------------------------------------
SettingsDefine - 04_sds_rev_errs.py: PASS
--------------------------------------------------------------------
SettingsDefineCapabilities - 01_forward.py: PASS
--------------------------------------------------------------------
SettingsDefineCapabilities - 03_forward_errs.py: PASS
--------------------------------------------------------------------
SettingsDefineCapabilities - 04_forward_vsmsdata.py: PASS
--------------------------------------------------------------------
SettingsDefineCapabilities - 05_reverse_vsmcap.py: PASS
--------------------------------------------------------------------
SystemDevice - 01_forward.py: PASS
--------------------------------------------------------------------
SystemDevice - 02_reverse.py: PASS
--------------------------------------------------------------------
SystemDevice - 03_fwderrs.py: PASS
--------------------------------------------------------------------
VSSD - 01_enum.py: PASS
--------------------------------------------------------------------
VSSD - 02_bootldr.py: SKIP
--------------------------------------------------------------------
VSSD - 03_vssd_gi_errs.py: PASS
--------------------------------------------------------------------
VSSD - 04_vssd_to_rasd.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 01_definesystem_name.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 02_destroysystem.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 03_definesystem_ess.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 04_definesystem_ers.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 05_destroysystem_neg.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 06_addresource.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 07_addresource_neg.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 08_modifyresource.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 09_procrasd_persist.py: FAIL
ERROR - limit is 0, expected 256
ERROR - rstest_domain CPU scheduling not set properly
--------------------------------------------------------------------
VirtualSystemManagementService - 10_hv_version.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 11_define_memrasdunits.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 12_referenced_config.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 13_refconfig_additional_devs.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 14_define_sys_disk.py: PASS
--------------------------------------------------------------------
VirtualSystemMigrationCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemMigrationService - 01_migratable_host.py: PASS
--------------------------------------------------------------------
VirtualSystemMigrationService - 02_host_migrate_type.py: PASS
--------------------------------------------------------------------
VirtualSystemMigrationService - 05_migratable_host_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemMigrationSettingData - 01_enum.py: PASS
--------------------------------------------------------------------
VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemSettingDataComponent - 01_forward.py: PASS
--------------------------------------------------------------------
VirtualSystemSettingDataComponent - 02_reverse.py: PASS
--------------------------------------------------------------------
VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemSnapshotService - 01_enum.py: PASS
--------------------------------------------------------------------
VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS
--------------------------------------------------------------------
Thanks and Regards,
Deepti.
16 years, 2 months
- 2
- 2
KVM on sfcb Test Run Summary for Oct 20 2008
by Guo Lian Yun
=================================================
KVM on sfcb Test Run Summary for Oct 20 2008
=================================================
Distro: Fedora release 9.90.1 (Rawhide)
Kernel: 2.6.27-0.323.rc6.fc10.x86_64
libvirt: 0.4.5
Hypervisor: QEMU 0.9.1
CIMOM: sfcb sfcbd 1.3.3preview
Libvirt-cim revision: 715+
Libvirt-cim changeset: f7dfc83a73ac+
=================================================
FAIL : 1
XFAIL : 2
SKIP : 6
PASS : 127
-----------------
Total : 136
=================================================
FAIL Test Summary:
ComputerSystemIndication - 01_created_indication.py: FAIL
=================================================
XFAIL Test Summary:
ComputerSystem - 32_start_reboot.py: XFAIL
ComputerSystem - 33_suspend_reboot.py: XFAIL
=================================================
SKIP Test Summary:
ComputerSystem - 02_nosystems.py: SKIP
LogicalDisk - 02_nodevs.py: SKIP
VSSD - 02_bootldr.py: SKIP
VirtualSystemMigrationService - 01_migratable_host.py: SKIP
VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP
VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP
=================================================
Full report:
--------------------------------------------------------------------
AllocationCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
AllocationCapabilities - 02_alloccap_gi_errs.py: PASS
--------------------------------------------------------------------
ComputerSystem - 01_enum.py: PASS
--------------------------------------------------------------------
ComputerSystem - 02_nosystems.py: SKIP
ERROR - System has defined domains; unable to run
--------------------------------------------------------------------
ComputerSystem - 03_defineVS.py: PASS
--------------------------------------------------------------------
ComputerSystem - 04_defineStartVS.py: PASS
--------------------------------------------------------------------
ComputerSystem - 05_activate_defined_start.py: PASS
--------------------------------------------------------------------
ComputerSystem - 06_paused_active_suspend.py: PASS
--------------------------------------------------------------------
ComputerSystem - 22_define_suspend.py: PASS
--------------------------------------------------------------------
ComputerSystem - 23_suspend_suspend.py: PASS
--------------------------------------------------------------------
ComputerSystem - 27_define_suspend_errs.py: PASS
--------------------------------------------------------------------
ComputerSystem - 32_start_reboot.py: XFAIL
ERROR - Exception: (1, u'Domain Operation Failed')
ERROR - Unable to 'Reboot' dom 'cs_test_domain' using
RequestedStateChange()
InvokeMethod(RequestStateChange): Domain Operation Failed
Bug:<00005>
--------------------------------------------------------------------
ComputerSystem - 33_suspend_reboot.py: XFAIL
ERROR - Exception: (1, u'Domain Operation Failed')
ERROR - Unable to 'Reboot' dom 'test_domain' using
RequestedStateChange()
InvokeMethod(RequestStateChange): Domain Operation Failed
Bug:<00005>
--------------------------------------------------------------------
ComputerSystem - 35_start_reset.py: PASS
--------------------------------------------------------------------
ComputerSystem - 40_RSC_start.py: PASS
--------------------------------------------------------------------
ComputerSystem - 41_cs_to_settingdefinestate.py: PASS
--------------------------------------------------------------------
ComputerSystem - 42_cs_gi_errs.py: PASS
--------------------------------------------------------------------
ComputerSystemIndication - 01_created_indication.py: FAIL
ERROR - Exception: not enough arguments for format string
Got indication: KVM_ComputerSystemCreatedIndication
ERROR - Received indication error: 256
ERROR - Exception: not enough arguments for format string
Got indication: KVM_ComputerSystemCreatedIndication
ERROR - Received indication error: 256
--------------------------------------------------------------------
ElementAllocatedFromPool - 01_forward.py: PASS
--------------------------------------------------------------------
ElementAllocatedFromPool - 02_reverse.py: PASS
--------------------------------------------------------------------
ElementAllocatedFromPool - 03_reverse_errs.py: PASS
--------------------------------------------------------------------
ElementAllocatedFromPool - 04_forward_errs.py: PASS
--------------------------------------------------------------------
ElementCapabilities - 01_forward.py: PASS
--------------------------------------------------------------------
ElementCapabilities - 02_reverse.py: PASS
--------------------------------------------------------------------
ElementCapabilities - 03_forward_errs.py: PASS
--------------------------------------------------------------------
ElementCapabilities - 04_reverse_errs.py: PASS
--------------------------------------------------------------------
ElementCapabilities - 05_hostsystem_cap.py: PASS
--------------------------------------------------------------------
ElementConforms - 01_forward.py: PASS
--------------------------------------------------------------------
ElementConforms - 02_reverse.py: PASS
--------------------------------------------------------------------
ElementConforms - 03_ectp_fwd_errs.py: PASS
--------------------------------------------------------------------
ElementConforms - 04_ectp_rev_errs.py: PASS
--------------------------------------------------------------------
ElementSettingData - 01_forward.py: PASS
--------------------------------------------------------------------
ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS
--------------------------------------------------------------------
EnabledLogicalElementCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS
--------------------------------------------------------------------
HostSystem - 01_enum.py: PASS
--------------------------------------------------------------------
HostSystem - 02_hostsystem_to_rasd.py: PASS
--------------------------------------------------------------------
HostSystem - 03_hs_to_settdefcap.py: PASS
--------------------------------------------------------------------
HostSystem - 04_hs_to_EAPF.py: PASS
--------------------------------------------------------------------
HostSystem - 05_hs_gi_errs.py: PASS
--------------------------------------------------------------------
HostSystem - 06_hs_to_vsms.py: PASS
--------------------------------------------------------------------
HostedDependency - 01_forward.py: PASS
--------------------------------------------------------------------
HostedDependency - 02_reverse.py: PASS
--------------------------------------------------------------------
HostedDependency - 03_enabledstate.py: PASS
--------------------------------------------------------------------
HostedDependency - 04_reverse_errs.py: PASS
--------------------------------------------------------------------
HostedResourcePool - 01_forward.py: PASS
--------------------------------------------------------------------
HostedResourcePool - 02_reverse.py: PASS
--------------------------------------------------------------------
HostedResourcePool - 03_forward_errs.py: PASS
--------------------------------------------------------------------
HostedResourcePool - 04_reverse_errs.py: PASS
--------------------------------------------------------------------
HostedService - 01_forward.py: PASS
--------------------------------------------------------------------
HostedService - 02_reverse.py: PASS
--------------------------------------------------------------------
HostedService - 03_forward_errs.py: PASS
--------------------------------------------------------------------
HostedService - 04_reverse_errs.py: PASS
--------------------------------------------------------------------
LogicalDisk - 01_disk.py: PASS
--------------------------------------------------------------------
LogicalDisk - 02_nodevs.py: SKIP
ERROR - System has defined domains; unable to run
--------------------------------------------------------------------
LogicalDisk - 03_ld_gi_errs.py: PASS
--------------------------------------------------------------------
Memory - 01_memory.py: PASS
--------------------------------------------------------------------
Memory - 02_defgetmem.py: PASS
--------------------------------------------------------------------
Memory - 03_mem_gi_errs.py: PASS
--------------------------------------------------------------------
NetworkPort - 01_netport.py: PASS
--------------------------------------------------------------------
NetworkPort - 02_np_gi_errors.py: PASS
--------------------------------------------------------------------
NetworkPort - 03_user_netport.py: PASS
--------------------------------------------------------------------
Processor - 01_processor.py: PASS
--------------------------------------------------------------------
Processor - 02_definesys_get_procs.py: PASS
--------------------------------------------------------------------
Processor - 03_proc_gi_errs.py: PASS
--------------------------------------------------------------------
Profile - 01_enum.py: PASS
--------------------------------------------------------------------
Profile - 02_profile_to_elec.py: PASS
--------------------------------------------------------------------
Profile - 03_rprofile_gi_errs.py: PASS
--------------------------------------------------------------------
RASD - 01_verify_rasd_fields.py: PASS
--------------------------------------------------------------------
RASD - 02_enum.py: PASS
--------------------------------------------------------------------
RASD - 03_rasd_errs.py: PASS
--------------------------------------------------------------------
RASD - 04_disk_rasd_size.py: PASS
--------------------------------------------------------------------
ReferencedProfile - 01_verify_refprof.py: PASS
--------------------------------------------------------------------
ReferencedProfile - 02_refprofile_errs.py: PASS
--------------------------------------------------------------------
ResourceAllocationFromPool - 01_forward.py: PASS
--------------------------------------------------------------------
ResourceAllocationFromPool - 02_reverse.py: PASS
--------------------------------------------------------------------
ResourceAllocationFromPool - 03_forward_errs.py: PASS
--------------------------------------------------------------------
ResourceAllocationFromPool - 04_reverse_errs.py: PASS
--------------------------------------------------------------------
ResourceAllocationFromPool - 05_RAPF_err.py: PASS
--------------------------------------------------------------------
ResourcePool - 01_enum.py: PASS
--------------------------------------------------------------------
ResourcePool - 02_rp_gi_errors.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationService - 01_enum.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationService - 03_CreateResourcePool.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: PASS
--------------------------------------------------------------------
ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py:
PASS
--------------------------------------------------------------------
ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS
--------------------------------------------------------------------
SettingsDefine - 01_forward.py: PASS
--------------------------------------------------------------------
SettingsDefine - 02_reverse.py: PASS
--------------------------------------------------------------------
SettingsDefine - 03_sds_fwd_errs.py: PASS
--------------------------------------------------------------------
SettingsDefine - 04_sds_rev_errs.py: PASS
--------------------------------------------------------------------
SettingsDefineCapabilities - 01_forward.py: PASS
--------------------------------------------------------------------
SettingsDefineCapabilities - 03_forward_errs.py: PASS
--------------------------------------------------------------------
SettingsDefineCapabilities - 04_forward_vsmsdata.py: PASS
--------------------------------------------------------------------
SettingsDefineCapabilities - 05_reverse_vsmcap.py: PASS
--------------------------------------------------------------------
SystemDevice - 01_forward.py: PASS
--------------------------------------------------------------------
SystemDevice - 02_reverse.py: PASS
--------------------------------------------------------------------
SystemDevice - 03_fwderrs.py: PASS
--------------------------------------------------------------------
VSSD - 01_enum.py: PASS
--------------------------------------------------------------------
VSSD - 02_bootldr.py: SKIP
--------------------------------------------------------------------
VSSD - 03_vssd_gi_errs.py: PASS
--------------------------------------------------------------------
VSSD - 04_vssd_to_rasd.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 01_definesystem_name.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 02_destroysystem.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 03_definesystem_ess.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 04_definesystem_ers.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 05_destroysystem_neg.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 06_addresource.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 07_addresource_neg.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 08_modifyresource.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 09_procrasd_persist.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 10_hv_version.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 11_define_memrasdunits.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 12_referenced_config.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 13_refconfig_additional_devs.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 14_define_sys_disk.py: PASS
--------------------------------------------------------------------
VirtualSystemMigrationCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemMigrationService - 01_migratable_host.py: SKIP
--------------------------------------------------------------------
VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP
--------------------------------------------------------------------
VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP
--------------------------------------------------------------------
VirtualSystemMigrationSettingData - 01_enum.py: PASS
--------------------------------------------------------------------
VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemSettingDataComponent - 01_forward.py: PASS
--------------------------------------------------------------------
VirtualSystemSettingDataComponent - 02_reverse.py: PASS
--------------------------------------------------------------------
VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemSnapshotService - 01_enum.py: PASS
--------------------------------------------------------------------
VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py:
PASS
--------------------------------------------------------------------
16 years, 2 months
- 2
- 1
[PATCH] * Added association Console Redirections Service <-> Console Redirection
by Richard Maciel
# HG changeset patch
# User Richard Maciel <richardm(a)br.ibm.com>
# Date 1224286653 25200
# Node ID b1da9a0f3b05f631aef5df5494c94fa57491e46d
# Parent f7b995404a9c6a4c55374155b9d6826ad6fb2f3a
* Added association Console Redirections Service <-> Console Redirection
Service Capabilities into the ElementCapabilities.c file
* Added ConsoleRedirectionServiceCapabilities.h to export the
get_console_rs_caps function get_console_rs_caps is not static anymore
* Added ConsoleRedirectionServiceCapabilities.h to export the
get_console_rs_caps function
* get_console_rs_caps is not static anymore
* Fixed whitespace issues
* Removed not useful CU_DEBUG calls from ElementCapabilities.c file
Signed-off-by: Richard Maciel <richardm(a)br.ibm.com>
diff -r f7b995404a9c -r b1da9a0f3b05 src/Makefile.am
--- a/src/Makefile.am Mon Oct 06 08:37:42 2008 -0700
+++ b/src/Makefile.am Fri Oct 17 16:37:33 2008 -0700
@@ -21,7 +21,8 @@
Virt_VirtualSystemSnapshotService.h \
Virt_VirtualSystemSnapshotServiceCapabilities.h \
Virt_VSMigrationSettingData.h \
- Virt_ConsoleRedirectionService.h
+ Virt_ConsoleRedirectionService.h \
+ Virt_ConsoleRedirectionServiceCapabilities.h
XKUADD = $(top_builddir)/libxkutil/libxkutil.la
@@ -119,7 +120,7 @@
libVirt_AllocationCapabilities_la_SOURCES = Virt_AllocationCapabilities.c
libVirt_AllocationCapabilities_la_LIBADD = -lVirt_DevicePool
-libVirt_ElementCapabilities_la_DEPENDENCIES = libVirt_VirtualSystemManagementCapabilities.la libVirt_EnabledLogicalElementCapabilities.la libVirt_ComputerSystem.la libVirt_HostSystem.la libVirt_VSMigrationCapabilities.la libVirt_VirtualSystemManagementService.la libVirt_VSMigrationService.la libVirt_DevicePool.la
+libVirt_ElementCapabilities_la_DEPENDENCIES = libVirt_VirtualSystemManagementCapabilities.la libVirt_EnabledLogicalElementCapabilities.la libVirt_ComputerSystem.la libVirt_HostSystem.la libVirt_VSMigrationCapabilities.la libVirt_VirtualSystemManagementService.la libVirt_VSMigrationService.la libVirt_DevicePool.la libVirt_ConsoleRedirectionService.la libVirt_ConsoleRedirectionServiceCapabilities.la
libVirt_ElementCapabilities_la_SOURCES = Virt_ElementCapabilities.c
libVirt_ElementCapabilities_la_LIBADD = -lVirt_VirtualSystemManagementCapabilities \
-lVirt_EnabledLogicalElementCapabilities \
@@ -129,7 +130,9 @@
-lVirt_AllocationCapabilities \
-lVirt_VirtualSystemManagementService \
-lVirt_VSMigrationService \
- -lVirt_DevicePool
+ -lVirt_DevicePool \
+ -lVirt_ConsoleRedirectionService \
+ -lVirt_ConsoleRedirectionServiceCapabilities
libVirt_SettingsDefineCapabilities_la_DEPENDENCIES = libVirt_RASD.la libVirt_DevicePool.la libVirt_VSMigrationCapabilities.la libVirt_VSMigrationSettingData.la
libVirt_SettingsDefineCapabilities_la_SOURCES = Virt_SettingsDefineCapabilities.c
diff -r f7b995404a9c -r b1da9a0f3b05 src/Virt_ConsoleRedirectionServiceCapabilities.c
--- a/src/Virt_ConsoleRedirectionServiceCapabilities.c Mon Oct 06 08:37:42 2008 -0700
+++ b/src/Virt_ConsoleRedirectionServiceCapabilities.c Fri Oct 17 16:37:33 2008 -0700
@@ -32,6 +32,7 @@
#include "svpc_types.h"
#include "Virt_ConsoleRedirectionService.h"
+#include "Virt_ConsoleRedirectionServiceCapabilities.h"
const static CMPIBroker *_BROKER;
@@ -69,10 +70,10 @@
return s;
}
-static CMPIStatus get_console_rs_caps(const CMPIBroker *broker,
- const CMPIObjectPath *ref,
- CMPIInstance **_inst,
- bool is_get_inst)
+CMPIStatus get_console_rs_caps(const CMPIBroker *broker,
+ const CMPIObjectPath *ref,
+ CMPIInstance **_inst,
+ bool is_get_inst)
{
CMPIStatus s = {CMPI_RC_OK, NULL};
CMPIInstance *inst = NULL;
diff -r f7b995404a9c -r b1da9a0f3b05 src/Virt_ConsoleRedirectionServiceCapabilities.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Virt_ConsoleRedirectionServiceCapabilities.h Fri Oct 17 16:37:33 2008 -0700
@@ -0,0 +1,35 @@
+/*
+ * Copyright IBM Corp. 2008
+ *
+ * Authors:
+ * Richard Maciel <richardm(a)br.ibm.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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
+ */
+
+CMPIStatus get_console_rs_caps(const CMPIBroker *broker,
+ const CMPIObjectPath *ref,
+ CMPIInstance **_inst,
+ bool is_get_inst);
+
+ /*
+ * Local Variables:
+ * mode: C
+ * c-set-style: "K&R"
+ * tab-width: 8
+ * c-basic-offset: 8
+ * indent-tabs-mode: nil
+ * End:
+ */
diff -r f7b995404a9c -r b1da9a0f3b05 src/Virt_ElementCapabilities.c
--- a/src/Virt_ElementCapabilities.c Mon Oct 06 08:37:42 2008 -0700
+++ b/src/Virt_ElementCapabilities.c Fri Oct 17 16:37:33 2008 -0700
@@ -41,6 +41,8 @@
#include "Virt_VSMigrationCapabilities.h"
#include "Virt_AllocationCapabilities.h"
#include "Virt_DevicePool.h"
+#include "Virt_ConsoleRedirectionService.h"
+#include "Virt_ConsoleRedirectionServiceCapabilities.h"
#include "svpc_types.h"
@@ -75,7 +77,14 @@
goto out;
s = get_migration_service(ref, &_inst, _BROKER, context, false);
- } else
+ } else if (STREQC(classname, "ConsoleRedirectionServiceCapabilities")) {
+ s = get_console_rs_caps(_BROKER, ref, &_inst, true);
+
+ if((s.rc != CMPI_RC_OK) || (_inst == NULL))
+ goto out;
+
+ s = get_console_rs(ref, &_inst, _BROKER, context, false);
+ } else
cu_statusf(_BROKER, &s,
CMPI_RC_ERR_NOT_FOUND,
"Not found");
@@ -100,7 +109,6 @@
char* classname;
classname = class_base_name(CLASSNAME(ref));
-
if (STREQC(classname, "VirtualSystemManagementService")) {
s = get_vsms(ref, &_inst, _BROKER, context, true);
if ((s.rc != CMPI_RC_OK) || (_inst == NULL))
@@ -113,6 +121,14 @@
goto out;
s = get_migration_caps(ref, &_inst, _BROKER, false);
+ } else if (STREQC(classname, "ConsoleRedirectionService")) {
+ s = get_console_rs(ref, &_inst, _BROKER, context, true);
+ if((s.rc != CMPI_RC_OK) || (_inst == NULL))
+ goto out;
+
+ s = get_console_rs_caps(_BROKER, ref, &_inst, false);
+ if((s.rc != CMPI_RC_OK) || (_inst == NULL))
+ goto out;
} else
cu_statusf(_BROKER, &s,
CMPI_RC_ERR_NOT_FOUND,
@@ -382,22 +398,28 @@
"Xen_HostSystem",
"Xen_VirtualSystemManagementService",
"Xen_VirtualSystemMigrationService",
+ "Xen_ConsoleRedirectionService",
"KVM_HostSystem",
"KVM_VirtualSystemManagementService",
"KVM_VirtualSystemMigrationService",
+ "KVM_ConsoleRedirectionService",
"LXC_HostSystem",
"LXC_VirtualSystemManagementService",
"LXC_VirtualSystemMigrationService",
+ "LXC_ConsoleRedirectionService",
NULL
};
static char *host_caps[] = {
"Xen_VirtualSystemManagementCapabilities",
"Xen_VirtualSystemMigrationCapabilities",
+ "Xen_ConsoleRedirectionServiceCapabilities",
"KVM_VirtualSystemManagementCapabilities",
"KVM_VirtualSystemMigrationCapabilities",
+ "KVM_ConsoleRedirectionServiceCapabilities",
"LXC_VirtualSystemManagementCapabilities",
"LXC_VirtualSystemMigrationCapabilities",
+ "LXC_ConsoleRedirectionServiceCapabilities",
NULL,
};
@@ -434,6 +456,9 @@
"Xen_VirtualSystemMigrationService",
"KVM_VirtualSystemMigrationService",
"LXC_VirtualSystemMigrationService",
+ "Xen_ConsoleRedirectionService",
+ "KVM_ConsoleRedirectionService",
+ "LXC_ConsoleRedirectionService",
NULL
};
16 years, 2 months
- 2
- 1
[PATCH] [TEST] Update all tc to call new GetInstance
by yunguol＠cn.ibm.com
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1224469713 25200
# Node ID 0ebf9d140faab8bee8802ecf5f2de8a30286ff0c
# Parent a3d9c0a81c27471418993b7c8f907f0b95f79e63
[TEST] Update all tc to call new GetInstance
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r a3d9c0a81c27 -r 0ebf9d140faa suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Wed Oct 15 19:13:10 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Sun Oct 19 19:28:33 2008 -0700
@@ -73,12 +73,12 @@ def main():
if not ret :
logger.error("ERROR: VS %s was not defined" % test_dom)
return status
-
+ cs_class = get_typed_class(options.virt, 'ComputerSystem')
keys = {
'Name' : test_dom,
- 'CreationClassName' : get_typed_class(options.virt, 'ComputerSystem')
+ 'CreationClassName' : cs_class
}
- cs = enumclass.getInstance(options.ip, 'ComputerSystem', keys, options.virt)
+ cs = enumclass.GetInstance(options.ip, cs_class, keys)
if cs.Name == test_dom:
from_State = cs.EnabledState
@@ -101,7 +101,7 @@ def main():
#Get the value of the EnabledState property and RequestedState property.
try:
- cs= enumclass.getInstance(options.ip, 'ComputerSystem', keys, options.virt)
+ cs= enumclass.GetInstance(options.ip, cs_class, keys)
if cs.Name == test_dom:
to_RequestedState = cs.RequestedState
enabledState = cs.EnabledState
diff -r a3d9c0a81c27 -r 0ebf9d140faa suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py Wed Oct 15 19:13:10 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py Sun Oct 19 19:28:33 2008 -0700
@@ -45,7 +45,7 @@ from XenKvmLib.assoc import Associators
from XenKvmLib.assoc import Associators
from XenKvmLib.test_doms import destroy_and_undefine_all
from XenKvmLib import devices
-from XenKvmLib.enumclass import getInstance
+from XenKvmLib.enumclass import GetInstance
from CimTest.Globals import CIM_ERROR_ASSOCIATORS, CIM_ERROR_GETINSTANCE
from XenKvmLib.vxml import get_class
from XenKvmLib.classes import get_typed_class
@@ -61,16 +61,17 @@ test_vcpus = 1
test_vcpus = 1
def get_inst(server, virt, cn, key_list):
+ cn_name = get_typed_class(virt, cn)
inst = None
try:
- inst = getInstance(server, cn, key_list, virt)
+ inst = GetInstance(server, cn_name, key_list)
except Exception, details:
logger.error("Exception %s" % details)
return None
if inst is None:
- logger.error("Expected at least one %s instance" % cn)
+ logger.error("Expected at least one %s instance" % cn_name)
return None
return inst
diff -r a3d9c0a81c27 -r 0ebf9d140faa suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py
--- a/suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py Wed Oct 15 19:13:10 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py Sun Oct 19 19:28:33 2008 -0700
@@ -34,7 +34,7 @@ from CimTest.Globals import logger, CIM_
CIM_ERROR_ASSOCIATORNAMES
from XenKvmLib.const import do_main
from CimTest.ReturnCodes import PASS, FAIL, SKIP
-from XenKvmLib.enumclass import getInstance
+from XenKvmLib.enumclass import GetInstance
sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
test_dom = "dom_elecap"
@@ -94,8 +94,7 @@ def verify_service(inst_list, ip, virt,
'SystemCreationClassName' : host_ccn
}
try:
- basename = get_class_basename(ser_cn)
- service = getInstance(ip, basename, keys, virt)
+ service = GetInstance(ip, ser_cn, keys)
except Exception, detail:
logger.error(CIM_ERROR_GETINSTANCE, ser_cn)
logger.error("Exeption : %s", detail)
diff -r a3d9c0a81c27 -r 0ebf9d140faa suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py Wed Oct 15 19:13:10 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py Sun Oct 19 19:28:33 2008 -0700
@@ -73,13 +73,11 @@ def setup_env(server, virt):
return PASS, vsxml, test_disk
def get_instance(server, pool, list, virt='Xen'):
+ pool_cn = get_typed_class(virt, pool)
try:
- inst = enumclass.getInstance(server,
- pool,
- list,
- virt)
+ inst = enumclass.GetInstance(server, pool_cn, list)
except Exception:
- logger.error(Globals.CIM_ERROR_GETINSTANCE % pool)
+ logger.error(Globals.CIM_ERROR_GETINSTANCE % pool_cn)
return FAIL, inst
return PASS, inst
diff -r a3d9c0a81c27 -r 0ebf9d140faa suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py Wed Oct 15 19:13:10 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py Sun Oct 19 19:28:33 2008 -0700
@@ -105,7 +105,7 @@ def get_rasd_instance(server, virt, key_
def get_rasd_instance(server, virt, key_list, cn):
inst = None
try:
- inst = enumclass.getInstance(server, cn, key_list, virt)
+ inst = enumclass.GetInstance(server, cn, key_list)
except Exception, details:
logger.error(Globals.CIM_ERROR_GETINSTANCE, cn)
logger.error("Exception details: %s", details)
diff -r a3d9c0a81c27 -r 0ebf9d140faa suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py
--- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Wed Oct 15 19:13:10 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Sun Oct 19 19:28:33 2008 -0700
@@ -78,7 +78,7 @@ def get_or_bail(virt, ip, id, pool_class
"""
key_list = { 'InstanceID' : id }
try:
- instance = enumclass.getInstance(ip, pool_class, key_list, virt)
+ instance = enumclass.GetInstance(ip, pool_class, key_list)
except Exception, detail:
logger.error(CIM_ERROR_GETINSTANCE, '%s' % pool_class)
logger.error("Exception: %s", detail)
@@ -123,8 +123,7 @@ def init_list(virt, pool):
def get_pool_info(virt, server, devid, poolname=""):
pool_cname = get_typed_class(virt, poolname)
- pool_cn = eval("enumclass." + pool_cname)
- return get_or_bail(virt, server, id=devid, pool_class=pool_cn)
+ return get_or_bail(virt, server, id=devid, pool_class=pool_cname)
def get_pool_details(virt, server):
dpool = npool = mpool = ppool = None
16 years, 2 months
- 2
- 1