[PATCH] Generating Deleted indication after Modified indication.
by Sharad Mishra
# 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);
14 years, 2 months
- 2
- 1
[PATCH] [TEST] Test macvtap patch
by Sharad Mishra
# 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())
+
14 years, 2 months
- 2
- 1
[PATCH] [TEST] Fixing RPCS/10*py to work for libvirt_cim changes < 1032 revision
by Deepti B. Kalakeri
# HG changeset patch
# User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com>
# Date 1272267529 25200
# Node ID 3d5bb69edc67ab8097a61cff09927fdf4c5d3f4b
# Parent 456106b86cf4572684877cc923f3af991b4b65bb
[TEST] Fixing RPCS/10*py to work for libvirt_cim changes < 1032 revision
The test has been verified with KVM and libvirt-cim rpm for rev<1032
Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
diff -r 456106b86cf4 -r 3d5bb69edc67 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py
--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py Mon Mar 15 09:16:15 2010 -0400
+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py Mon Apr 26 00:38:49 2010 -0700
@@ -45,6 +45,7 @@
pool_attr = { 'Path' : _image_dir }
vol_name = "cimtest-vol.img"
+libvirt_stovol_instance_id=1032
def get_template_rasd_from_sdc(virt, server, dp_inst_id):
rasd = None
@@ -231,7 +232,8 @@
if res[0] != PASS:
raise Exception("Failed to create the Vol %s" % vol_name)
- if res[1]['Resource']['InstanceID'] != exp_vol_path:
+ if res[1]['Resource']['InstanceID'] != exp_vol_path and \
+ cim_rev >= libvirt_stovol_instance_id:
raise Exception("Incorrect InstanceID")
else:
status = PASS
@@ -252,6 +254,8 @@
except Exception, details:
logger.error("Exception details: %s", details)
+ cleanup_pool_vol(server, virt, pool_name,
+ clean_pool, exp_vol_path)
status = FAIL
return status
14 years, 2 months
- 3
- 3
- ← Newer
- 1
- Older →