- CIM - libvirt List Archives

[PATCH] [TEST] Adding code to verify if a subnet used in the test case already exists
by Deepti B. Kalakeri 23 Jul '10

23 Jul '10

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1279892502 25200 # Node ID 3976f0cbef2a1be8f6572ede485552684747ae18 # Parent 4f2909dd0e2f9be6d3f32b0926d564d112ec2572 [TEST] Adding code to verify if a subnet used in the test case already exists The following tests failed because of the networkpool withe the same subnet existed on the machine. VirtualSystemManagementService - 06_addresource.py: FAIL VirtualSystemManagementService - 18_define_sys_bridge.py: FAIL VirtualSystemManagementService - 19_definenetwork_ers.py: FAIL VirtualSystemManagementService - 22_addmulti_brg_interface.py: FAIL VirtualSystemManagementService - 23_verify_duplicate_mac_err.py: FAIL VirtualSystemManagementService - 27_definesystem_macvtap_dev.py: FAIL This fix will verify if the subnet already is used and gives appropriate message. Tested has been verified with KVM Libvirt-CIM Sources. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 4f2909dd0e2f -r 3976f0cbef2a suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri Jul 23 05:56:57 2010 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri Jul 23 06:41:42 2010 -0700 @@ -237,7 +237,7 @@ self.add_sub_node(network, 'name', self.net_name) self.add_sub_node(network, 'uuid', set_uuid()) self.add_sub_node(network, 'forward') - subnet = '192.168.123.' + subnet = '192.168.%d.' % (random.randint(1, 100)) self.add_sub_node(network, 'bridge', name=self.vbr, stp='on', forwardDelay='0') ip_base = random.randint(1, 100) @@ -249,6 +249,13 @@ awk '/ip address/ {print}' | \ cut -d ' ' -f 4 | sed 's/address=//'" % _net_name s, in_use_addr = utils.run_remote(server, cmd) + + sub_net_in_use = in_use_addr + sub_net_in_use = sub_net_in_use.rsplit('.', 1)[0].strip("'") + "." + if subnet == sub_net_in_use: + logger.error("Subnet address is in use by a different network") + return None + in_use_addr = in_use_addr.strip("'") if in_use_addr == addr: logger.error("IP address is in use by a different network")

2 1

seeing two instances from the CIM_VirtualSystemManagementCapabilities class...
by Chang, Jan 21 Jul '10

21 Jul '10

Hi, Has anyone experienced the problem where the root/virt namespace and CIM_VirtualSystemManagementCapabilities class is queried, both the KVM and Xen instances are returned? Does anyone know how to resolve this issue? Thanks, Jan

2 1

[PATCH] Add support for VSI/DCN
by Sharad Mishra 01 Jul '10

01 Jul '10

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1276810951 25200 # Node ID a31f3f023acdd0edd73636a86a93c08803dd7158 # Parent b2b8177338722a1f961430c8ccfe7820a5368ff7 Add support for VSI/DCN. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r b2b817733872 -r a31f3f023acd libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Tue Jun 15 14:25:34 2010 -0700 +++ b/libxkutil/device_parsing.c Thu Jun 17 14:42:31 2010 -0700 @@ -58,6 +58,17 @@ free(dev->bus_type); } +static void cleanup_vsi_device(struct vsi_device *dev) +{ + free(dev->vsi_type); + free(dev->manager_id); + free(dev->type_id); + free(dev->type_id_version); + free(dev->instance_id); + free(dev->filter_ref); + free(dev->profile_id); +} + static void cleanup_net_device(struct net_device *dev) { free(dev->type); @@ -66,6 +77,7 @@ free(dev->model); free(dev->device); free(dev->net_mode); + cleanup_vsi_device(&dev->vsi); } static void cleanup_emu_device(struct emu_device *dev) @@ -288,6 +300,7 @@ { struct virt_device *vdev = NULL; struct net_device *ndev = NULL; + struct vsi_device *vsi_dev = NULL; xmlNode *child = NULL; vdev = calloc(1, sizeof(*vdev)); @@ -295,6 +308,7 @@ goto err; ndev = &(vdev->dev.net) + vsi_dev = &(ndev->vsi); ndev->type = get_attr_value(inode, "type"); if (ndev->type == NULL) @@ -325,12 +339,28 @@ ndev->model = get_attr_value(child, "type"); if (ndev->model == NULL) goto err; + } else if (XSTREQ(child->name, "virtualport")) { + vsi_dev->vsi_type = get_attr_value(child, "type"); + if (vsi_dev->vsi_type == NULL) + goto err; + } else if (XSTREQ(child->name, "parameters")) { + vsi_dev->manager_id = get_attr_value(child, "managerid"); + if (vsi_dev->manager_id == NULL) + goto err; + + vsi_dev->type_id = get_attr_value(child, "typeid"); + if (vsi_dev->type_id == NULL) + goto err; + + vsi_dev->type_id_version = get_attr_value(child, "typeidversion"); + if (vsi_dev->type_id_version == NULL) + goto err; + + vsi_dev->instance_id = get_attr_value(child, "instanceid"); + vsi_dev->profile_id = get_attr_value(child, "profileid"); } } - if (ndev->mac == NULL) - goto err; - if (ndev->source == NULL) CU_DEBUG("No network source defined, leaving blank\n"); @@ -602,6 +632,7 @@ int len = 0; int count = 0; + CU_DEBUG("In parse_deviceso - type is %d", type); xmlDoc *xmldoc; xmlXPathContext *xpathCtx; xmlXPathObject *xpathObj; @@ -672,6 +703,13 @@ DUP_FIELD(dev, _dev, dev.net.model); DUP_FIELD(dev, _dev, dev.net.device); DUP_FIELD(dev, _dev, dev.net.net_mode); + DUP_FIELD(dev, _dev, dev.net.vsi.vsi_type); + DUP_FIELD(dev, _dev, dev.net.vsi.manager_id); + DUP_FIELD(dev, _dev, dev.net.vsi.type_id); + DUP_FIELD(dev, _dev, dev.net.vsi.type_id_version); + DUP_FIELD(dev, _dev, dev.net.vsi.instance_id); + DUP_FIELD(dev, _dev, dev.net.vsi.filter_ref); + DUP_FIELD(dev, _dev, dev.net.vsi.profile_id); } else if (dev->type == CIM_RES_TYPE_DISK) { DUP_FIELD(dev, _dev, dev.disk.type); DUP_FIELD(dev, _dev, dev.disk.device); @@ -980,6 +1018,7 @@ { int ret; + CU_DEBUG("In get_dominfo_from_xml"); *dominfo = malloc(sizeof(**dominfo)); if (*dominfo == NULL) return 0; @@ -1019,8 +1058,8 @@ { char *xml; int ret; + xml = virDomainGetXMLDesc(dom, 0); - xml = virDomainGetXMLDesc(dom, 0); if (xml == NULL) return 0; diff -r b2b817733872 -r a31f3f023acd libxkutil/device_parsing.h --- a/libxkutil/device_parsing.h Tue Jun 15 14:25:34 2010 -0700 +++ b/libxkutil/device_parsing.h Thu Jun 17 14:42:31 2010 -0700 @@ -33,6 +33,16 @@ #include "../src/svpc_types.h" +struct vsi_device { + char *vsi_type; + char *manager_id; + char *type_id; + char *type_id_version; + char *instance_id; + char *filter_ref; + char *profile_id; +}; + struct disk_device { char *type; char *device; @@ -52,6 +62,7 @@ char *model; char *device; char *net_mode; + struct vsi_device vsi; }; struct mem_device { diff -r b2b817733872 -r a31f3f023acd libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Tue Jun 15 14:25:34 2010 -0700 +++ b/libxkutil/xmlgen.c Thu Jun 17 14:42:31 2010 -0700 @@ -159,6 +159,40 @@ return msg; } +static const char *set_net_vsi(xmlNodePtr nic, struct vsi_device *dev) +{ + xmlNodePtr tmp; + + tmp = xmlNewChild(nic, NULL, BAD_CAST "virtualport", NULL); + if (tmp == NULL) + return XML_ERROR; + xmlNewProp(tmp, BAD_CAST "type", BAD_CAST dev->vsi_type); + + tmp = xmlNewChild(tmp, NULL, BAD_CAST "parameters", NULL); + if (tmp == NULL) + return XML_ERROR; + if (STREQ(dev->vsi_type, "802.1Qbh")) { + if (dev->profile_id != NULL) + xmlNewProp(tmp, BAD_CAST "profileid", + BAD_CAST dev->profile_id); + } else { + if (dev->manager_id != NULL) + xmlNewProp(tmp, BAD_CAST "managerid", + BAD_CAST dev->manager_id); + if (dev->type_id != NULL) + xmlNewProp(tmp, BAD_CAST "typeid", + BAD_CAST dev->type_id); + if (dev->type_id_version != NULL) + xmlNewProp(tmp, BAD_CAST "typeidversion", + BAD_CAST dev->type_id_version); + if (dev->instance_id != NULL) + xmlNewProp(tmp, BAD_CAST "instanceid", + BAD_CAST dev->instance_id); + } + + return NULL; +} + static const char *set_net_source(xmlNodePtr nic, struct net_device *dev, const char *src_type) @@ -247,8 +281,13 @@ msg = bridge_net_to_xml(nic, net); else if (STREQ(dev->dev.net.type, "user")) continue; - else if (STREQ(dev->dev.net.type, "direct")) + else if (STREQ(dev->dev.net.type, "direct")) { msg = set_net_source(nic, net, "direct"); + if (net->vsi.vsi_type != NULL) { + struct vsi_device *vsi = &dev->dev.net.vsi; + msg = set_net_vsi(nic, vsi); + } + } else msg = "Unknown interface type"; } diff -r b2b817733872 -r a31f3f023acd schema/ResourceAllocationSettingData.mof --- a/schema/ResourceAllocationSettingData.mof Tue Jun 15 14:25:34 2010 -0700 +++ b/schema/ResourceAllocationSettingData.mof Thu Jun 17 14:42:31 2010 -0700 @@ -68,6 +68,29 @@ [Description ("Network mode, could be 'vepa', 'pepa' etc.")] string NetworkMode; + + [Description ("VSI type")] + string VSIType; + + [Description ("VSI manager id")] + string VSIManagerID; + + [Description ("VSI type")] + string VSITypeID; + + [Description ("expected/desired version of VTID")] + string VSITypeIDVersion; + + [Description ("A globally unique ID for the connection instance." + " The ID shall be done consistent with IETF RFC 4122.")] + string VSIInstanceID; + + [Description ("Profile ID")] + string ProfileID; + + [Description ("Filter REF")] + string FilterRef; + }; [Description ("KVM virtual network configuration"), @@ -90,6 +113,28 @@ [Description ("Network mode, could be 'vepa', 'pepa' etc.")] string NetworkMode; + + [Description ("VSI type")] + string VSIType; + + [Description ("VSI manager id")] + string VSIManagerID; + + [Description ("VSI type")] + string VSITypeID; + + [Description ("expected/desired version of VTID")] + string VSITypeIDVersion; + + [Description ("A globally unique ID for the connection instance." + " The ID shall be done consistent with IETF RFC 4122.")] + string VSIInstanceID; + + [Description ("Profile ID")] + string ProfileID; + + [Description ("Filter REF")] + string FilterRef; }; [Description ("LXC virtual network configuration"), diff -r b2b817733872 -r a31f3f023acd src/Virt_RASD.c --- a/src/Virt_RASD.c Tue Jun 15 14:25:34 2010 -0700 +++ b/src/Virt_RASD.c Thu Jun 17 14:42:31 2010 -0700 @@ -278,6 +278,57 @@ return s; } +static CMPIStatus set_net_vsi_rasd_params(const CMPIBroker *broker, + const CMPIObjectPath *ref, + const struct vsi_device vsi, + CMPIInstance *inst) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + + CMSetProperty(inst, + "VSIType", + (CMPIValue *)vsi.vsi_type, + CMPI_chars); + + if (vsi.manager_id != NULL) + CMSetProperty(inst, + "VSIManagerID", + (CMPIValue *)vsi.manager_id, + CMPI_chars); + + if (vsi.type_id != NULL) + CMSetProperty(inst, + "VSITypeID", + (CMPIValue *)vsi.type_id, + CMPI_chars); + + if (vsi.type_id_version != NULL) + CMSetProperty(inst, + "VSITypeIDVersion", + (CMPIValue *)vsi.type_id_version, + CMPI_chars); + + if (vsi.instance_id != NULL) + CMSetProperty(inst, + "VSIInstanceID", + (CMPIValue *)vsi.instance_id, + CMPI_chars); + + if (vsi.filter_ref != NULL) + CMSetProperty(inst, + "FilterRef", + (CMPIValue *)vsi.filter_ref, + CMPI_chars); + + if (vsi.profile_id != NULL) + CMSetProperty(inst, + "ProfileID", + (CMPIValue *)vsi.profile_id, + CMPI_chars); + + return s; +} + static CMPIStatus set_net_rasd_params(const CMPIBroker *broker, const CMPIObjectPath *ref, const struct virt_device *dev, @@ -482,6 +533,13 @@ s = set_disk_rasd_params(broker, ref, dev, inst); } else if (dev->type == CIM_RES_TYPE_NET) { s = set_net_rasd_params(broker, ref, dev, inst); + if ((s.rc == CMPI_RC_OK) && + (dev->dev.net.vsi.vsi_type != NULL)) + s = set_net_vsi_rasd_params(broker, + ref, + dev->dev.net.vsi, + inst); + } else if (dev->type == CIM_RES_TYPE_MEM) { const char *units = "KiloBytes"; diff -r b2b817733872 -r a31f3f023acd src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Tue Jun 15 14:25:34 2010 -0700 +++ b/src/Virt_SettingsDefineCapabilities.c Thu Jun 17 14:42:31 2010 -0700 @@ -550,6 +550,12 @@ const char *src_dev, const char *net_mode, const char *model, + const char *vsi, + const char *manager, + const char *typeid, + const char *version, + const char *instance, + const char *profile, struct inst_list *list) { CMPIInstance *inst; @@ -583,6 +589,31 @@ CMSetProperty(inst, "ResourceSubType", (CMPIValue *)model, CMPI_chars); + if (vsi != NULL) + s = CMSetProperty(inst, "VSIType", + (CMPIValue *)vsi, CMPI_chars); + + + if (manager != NULL) + CMSetProperty(inst, "VSIManagerID", + (CMPIValue *)manager, CMPI_chars); + + if (typeid != NULL) + CMSetProperty(inst, "VSITypeID", + (CMPIValue *)typeid, CMPI_chars); + + if (version != NULL) + CMSetProperty(inst, "VSITypeIDVersion", + (CMPIValue *)version, CMPI_chars); + + if (instance != NULL) + CMSetProperty(inst, "VSIInstanceID", + (CMPIValue *)instance, CMPI_chars); + + if (profile != NULL) + CMSetProperty(inst, "ProfileID", + (CMPIValue *)profile, CMPI_chars); + inst_list_add(list, inst); out: @@ -600,8 +631,6 @@ int i,j; const char *type[] = {"network", "bridge", "user"}; const char *device[] = {"vtap1", NULL}; - const char *src_dev[] = {NULL, NULL}; - const char *net_mode[] = {NULL, NULL}; const char *model[] = {"e1000", NULL}; const char *name[] = {NULL, "br0", NULL}; @@ -641,17 +670,40 @@ name[i], num_nics, device[j], - src_dev[j], - net_mode[j], + NULL, + NULL, model[j], + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, list); if (s.rc != CMPI_RC_OK) goto out; } } - s = set_net_props(template_type, ref, id, "direct", NULL, num_nics, - NULL, "eth1", "vepa", NULL, list); + s = set_net_props(template_type, ref, id, "direct", NULL, + num_nics, NULL, "eth1", "vepa", NULL, + NULL, NULL, NULL, NULL, NULL, NULL, list); + /* profile id*/ + s = set_net_props(template_type, ref, id, "direct", NULL, + num_nics, NULL, "eth1", "vepa", NULL, + "802.1Qbh", NULL, NULL, NULL, + NULL, "my_profile", list); + /* no profile id but with instance id*/ + s = set_net_props(template_type, ref, id, "direct", NULL, + num_nics, NULL, "eth1", "vepa", NULL, + "802.1Qbg", "managerid", "typeid", + "typeidversion", "instanceid", NULL, + list); + /* no profile id and no instance id*/ + s = set_net_props(template_type, ref, id, "direct", NULL, + num_nics, NULL, "eth1", "vepa", NULL, + "802.1Qbg", "managerid", "typeid", + "typeidversion", "NULL", "NULL", list); out: return s; diff -r b2b817733872 -r a31f3f023acd src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Tue Jun 15 14:25:34 2010 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Thu Jun 17 14:42:31 2010 -0700 @@ -760,6 +760,50 @@ return "Source Device is empty"; else return "No Source Device specified"; + + free(dev->dev.net.vsi.vsi_type); + if (cu_get_str_prop(inst, "VSIType", &val) != CMPI_RC_OK) + dev->dev.net.vsi.vsi_type = NULL; + else + dev->dev.net.vsi.vsi_type = strdup(val); + + free(dev->dev.net.vsi.manager_id); + if (cu_get_str_prop(inst, "VSIManagerID", &val) != CMPI_RC_OK) + dev->dev.net.vsi.manager_id = NULL; + else + dev->dev.net.vsi.manager_id = strdup(val); + + free(dev->dev.net.vsi.type_id); + if (cu_get_str_prop(inst, "VSITypeID", &val) != CMPI_RC_OK) + dev->dev.net.vsi.type_id = NULL; + else + dev->dev.net.vsi.type_id = strdup(val); + + free(dev->dev.net.vsi.type_id_version); + if (cu_get_str_prop(inst, "VSITypeIDVersion", &val) != + CMPI_RC_OK) + dev->dev.net.vsi.type_id_version = NULL; + else + dev->dev.net.vsi.type_id_version = strdup(val); + + free(dev->dev.net.vsi.instance_id); + if (cu_get_str_prop(inst, "VSIInstanceID", &val) != CMPI_RC_OK) + dev->dev.net.vsi.instance_id = NULL; + else + dev->dev.net.vsi.instance_id = strdup(val); + + free(dev->dev.net.vsi.filter_ref); + if (cu_get_str_prop(inst, "FilterRef", &val) != CMPI_RC_OK) + dev->dev.net.vsi.filter_ref = NULL; + else + dev->dev.net.vsi.filter_ref = strdup(val); + + free(dev->dev.net.vsi.profile_id); + if (cu_get_str_prop(inst, "ProfileID", &val) != CMPI_RC_OK) + dev->dev.net.vsi.profile_id = NULL; + else + dev->dev.net.vsi.profile_id = strdup(val); + } else return "Invalid Network Type specified";

2 1

[PATCH] (#2) Generating Deleted indication after Modified indication
by Sharad Mishra 16 Jun '10

16 Jun '10

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1276637134 25200 # Node ID b2b8177338722a1f961430c8ccfe7820a5368ff7 # Parent e4583b1db56fd083c67d12a388a012ab860a5604 (#2) Generating Deleted indication after Modified indication. Changes: Virt_VSMigrationService changed, so patch was redone. This patch moves migration job deleted indication after migration job modified (job completed) indication. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r e4583b1db56f -r b2b817733872 src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Thu May 27 14:59:27 2010 -0700 +++ b/src/Virt_VSMigrationService.c Tue Jun 15 14:25:34 2010 -0700 @@ -1240,7 +1240,6 @@ } out: clear_infstore_migration_flag(dom); - raise_deleted_ind(job); free(uri); free(xml); @@ -1271,6 +1270,7 @@ CIM_JOBSTATE_COMPLETE, "Completed"); + raise_deleted_ind(job); virConnectClose(job->conn); free(job->domain); free(job->ref_cn);

2 1

[PATCH] Workaround for Pegasus ObjectPath issue
by Sharad Mishra 15 Jun '10

15 Jun '10

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1274997567 25200 # Node ID 49781459fdcfb5cd91eb7c1e99701d663d5b53eb # Parent 8b1793add36c7e72933c2f8f04c400fa9d3b8910 Workaround for Pegasus ObjectPath issue. Pegasus loses its object path after a call to CMGetObjectPath. This patch adds the object path back to indication. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 8b1793add36c -r 49781459fdcf src/Virt_ResourceAllocationSettingDataIndication.c --- a/src/Virt_ResourceAllocationSettingDataIndication.c Thu May 27 14:09:56 2010 -0700 +++ b/src/Virt_ResourceAllocationSettingDataIndication.c Thu May 27 14:59:27 2010 -0700 @@ -113,6 +113,10 @@ args->classname = strdup(CLASSNAME(ref)); args->_ctx = _ctx; + /* This is a workaround for Pegasus, it loses its objectpath by + CMGetObjectPath. So set it back. */ + ind->ft->setObjectPath((CMPIInstance *)ind, ref); + s = stdi_deliver(broker, ctx, args, (CMPIInstance *)ind); if (s.rc == CMPI_RC_OK) { CU_DEBUG("Indication delivered"); diff -r 8b1793add36c -r 49781459fdcf src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Thu May 27 14:09:56 2010 -0700 +++ b/src/Virt_VSMigrationService.c Thu May 27 14:59:27 2010 -0700 @@ -757,6 +757,11 @@ ind_name = ind_type_to_name(ind_type); ref = CMGetObjectPath(inst, &s); + + /* This is a workaround for Pegasus, it loses its objectpath by + CMGetObjectPath. So set it back. */ + inst->ft->setObjectPath((CMPIInstance *)inst, ref); + if ((ref == NULL) || (s.rc != CMPI_RC_OK)) { CU_DEBUG("Failed to get job reference"); } else {

2 1

[PATCH] Generating Deleted indication after Modified indication.
by Sharad Mishra 20 May '10

20 May '10

# HG changeset patch # User Sharad Mishra<snmishra(a)us.ibm.com> # Date 1269035366 25200 # Node ID 9147baed9cf8a7bf32a8076d7f98931a940eb59f # Parent 4ee7c4354bc550780bc02ef1f69fbda387b3fe13 Generating Deleted indication after Modified indication. This patch moves migration job deleted indication after migration job modified (job completed) indication. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 4ee7c4354bc5 -r 9147baed9cf8 src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Tue Mar 02 15:23:45 2010 -0800 +++ b/src/Virt_VSMigrationService.c Fri Mar 19 14:49:26 2010 -0700 @@ -1235,7 +1235,6 @@ } out: clear_infstore_migration_flag(dom); - raise_deleted_ind(job); free(uri); free(xml); @@ -1266,6 +1265,7 @@ CIM_JOBSTATE_COMPLETE, "Completed"); + raise_deleted_ind(job); virConnectClose(job->conn); free(job->domain); free(job->ref_cn);

2 1

[PATCH] Bypass cdrom check while defining VMs
by Sharad Mishra 20 May '10

20 May '10

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1274298264 25200 # Node ID 7e986e4a6963fa655d7a5ee70fd5819ae421471a # Parent 19ce54b3c16676a443c5df53562b0d67294dc04c Bypass cdrom check while defining VMs. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 19ce54b3c166 -r 7e986e4a6963 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Thu May 06 21:22:31 2010 -0400 +++ b/src/Virt_VirtualSystemManagementService.c Wed May 19 12:44:24 2010 -0700 @@ -810,8 +810,11 @@ if (type == VIRT_DISK_TYPE_DISK) dev->dev.disk.device = strdup("disk"); - else if (type == VIRT_DISK_TYPE_CDROM) + else if (type == VIRT_DISK_TYPE_CDROM) { dev->dev.disk.device = strdup("cdrom"); + if (dev->dev.disk.disk_type == DISK_UNKNOWN) + dev->dev.disk.disk_type = DISK_PHY; + } else if (type == VIRT_DISK_TYPE_FLOPPY) dev->dev.disk.device = strdup("floppy"); else

2 1

[PATCH] [TEST] Fix RPCS/08*py
by Deepti B. Kalakeri 17 May '10

17 May '10

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1274093983 25200 # Node ID 6ef4afb32928a4f54e5ff7cdb3b0acd2d76da6b5 # Parent 456106b86cf4572684877cc923f3af991b4b65bb [TEST] Fix RPCS/08*py Fix the RPCS/08*py tc to use /var/lib/libvirt/images/ path for creating dik images instead of /tmp The test has been verified with KVM and libvirt-cim current sources Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 456106b86cf4 -r 6ef4afb32928 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/08_CreateDiskResourcePool.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/08_CreateDiskResourcePool.py Mon Mar 15 09:16:15 2010 -0400 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/08_CreateDiskResourcePool.py Mon May 17 03:59:43 2010 -0700 @@ -62,7 +62,7 @@ libvirt_netfs_pool_support=869 def get_pool_attr(server, pool_type, dp_types, rev): - pool_attr = { "Path" : "/tmp" } + pool_attr = { "Path" : "/var/lib/libvirt/images/" } if rev >= libvirt_netfs_pool_support and \ pool_type == dp_types['DISK_POOL_NETFS']:

2 1

[PATCH] [TEST] Test macvtap patch
by Sharad Mishra 14 May '10

14 May '10

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1267471822 28800 # Node ID ee89554f681d3aad027dbaa166cbe26267472448 # Parent 3655b03ada11d9e99a1d10b97aaa7cdb737fc493 [TEST] Test macvtap patch. Verify that a vepa mode VM can be created. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 3655b03ada11 -r ee89554f681d suites/libvirt-cim/cimtest/VirtualSystemManagementService/27_definesystem_macvtap_dev.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/27_definesystem_macvtap_dev.py Mon Mar 01 11:30:22 2010 -0800 @@ -0,0 +1,152 @@ +#!/usr/bin/python +# +# Copyright 2010 IBM Corp. +# +# Authors: +# Sharad Mishra <snmishra(a)us.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 +# +# Purpose: +# Verify provider's support for macvtap. +# +# Steps: +# 1) Build RASD parameters, making sure to specify macvtap mode for network +# interface +# 2) Create guest +# 3) Verify guest is defined properly +# + +import sys +from CimTest.Globals import logger +from CimTest.ReturnCodes import FAIL, PASS, SKIP +from XenKvmLib.classes import get_typed_class, inst_to_mof +from XenKvmLib.rasd import get_default_rasds +from XenKvmLib.const import do_main, get_provider_version +from XenKvmLib.vxml import get_class +from XenKvmLib.common_util import parse_instance_id +from XenKvmLib.enumclass import EnumInstances + +sup_types = ['Xen', 'XenFV', 'KVM'] +test_dom = 'rstest_nic' + +target_dev_rev = 1029 + +def get_rasd_list(ip, virt, target_dev, source_dev): + nrasd_cn = get_typed_class(virt, "NetResourceAllocationSettingData") + + rasds = get_default_rasds(ip, virt) + + rasd_list = {} + + for rasd in rasds: + if rasd.classname == nrasd_cn and "Default" in rasd['InstanceID']: + + rasd['NetworkMode'] = target_dev + rasd['NetworkType'] = "direct" + rasd['SourceDevice'] = source_dev + + rasd_list[rasd.classname] = inst_to_mof(rasd) + + return rasd_list + +def verify_net_rasd(ip, virt, target_dev, source_dev, guest_name): + inst = None + + try: + nrasd_cn = get_typed_class(virt, 'NetResourceAllocationSettingData') + enum_list = EnumInstances(ip, nrasd_cn) + + if enum_list < 1: + raise Exception("No %s instances returned" % nrasd_cn) + + for rasd in enum_list: + guest, dev, status = parse_instance_id(rasd.InstanceID) + if status != PASS: + raise Exception("Unable to parse InstanceID: %s" % \ + rasd.InstanceID) + + if guest == guest_name: + inst = rasd + break + + if inst is None: + raise Exception("%s instance for %s not found" % (nrasd_cn, + guest_name)) + + if inst.NetworkMode != target_dev: + raise Exception("Expected NetworkMode to be %s" % target_dev) + + if inst.SourceDevice != source_dev: + raise Exception("Expected SourceDevice to be %s" % source_dev) + + except Exception, details: + logger.error(details) + return FAIL + + return PASS + +@do_main(sup_types) +def main(): + options = main.options + + status = FAIL + + curr_cim_rev, changeset = get_provider_version(options.virt, options.ip) + if curr_cim_rev < target_dev_rev: + logger.error("Network interface target device support is available" \ + " in rev >= %s", target_dev_rev) + return SKIP + + cxml = get_class(options.virt)(test_dom) + + target_dev = "vepa" + source_dev = "eth1" + + guest_defined = False + + try: + rasd_list = get_rasd_list(options.ip, options.virt, target_dev, source_dev) + if len(rasd_list) < 1: + raise Exception("Unable to get template RASDs for %s" % test_dom) + + cxml.set_res_settings(rasd_list) + ret = cxml.cim_define(options.ip) + if not ret: + raise Exception("Unable to define %s" % test_dom) + + guest_defined = True + + status = cxml.cim_start(options.ip) + if status != PASS: + raise Exception("Unable to start %s" % test_dom) + + status = verify_net_rasd(options.ip, options.virt, target_dev, + source_dev, test_dom) + if status != PASS: + raise Exception("Failed to net interface for %s" % test_dom) + + except Exception, details: + logger.error(details) + status = FAIL + + if guest_defined == True: + cxml.undefine(options.ip) + + return status + +if __name__ == "__main__": + sys.exit(main()) +

2 1

[PATCH] (#2) Use CIM 'AllocationUnits' to populate libvirt XML 'capacity unit' AND 'allocation unit'
by Chip Vincent 05 May '10

05 May '10

# HG changeset patch # User Chip Vincent <cvincent(a)us.ibm.com> # Date 1273081753 14400 # Node ID 293ef309c85b1b1b3551366624275d7a9bf6fb59 # Parent 22a4721a2d978fe611cb75255a094a0cc23abe5c (#2) Use CIM 'AllocationUnits' to populate libvirt XML 'capacity unit' AND 'allocation unit' Today, AllocationUnits only maps to capacity unit, which will leave allocation unit as the default (Kb). With this patch, both will be set to the same units. Signed-off-by: Chip Vincent <cvincent(a)us.ibm.com> diff -r 22a4721a2d97 -r 293ef309c85b libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Tue Mar 23 16:31:41 2010 -0700 +++ b/libxkutil/xmlgen.c Wed May 05 13:49:13 2010 -0400 @@ -1138,6 +1138,13 @@ goto out; free(string); + if (vol->cap_units != NULL) { + xmlAttrPtr tmp = NULL; + tmp = xmlNewProp(cap, BAD_CAST "unit", BAD_CAST vol->cap_units); + if (tmp == NULL) + goto out; + } + ret = asprintf(&string, "%" PRIu16, vol->cap); if (ret == -1) return XML_ERROR;

2 1