7:27 p.m.
Hello everyone,
I like to resubmit the patch based on suggestions form Deepti Kalakeri. I would
like to submit the testcse to verify duplicate UUID as a separate patch, so
its not included in this patchset.
Thx
yogi
7:27 p.m.
New subject: [PATCH 1 of 2] [Test] (#2) Patch to set UUID in domain
# HG changeset patch
# User anantyog(a)in.ibm.com
# Date 1249603785 25200
# Node ID 849bed1d2e467d6a2735e2c510ec0f40911c1554
# Parent ca99e2ff90ec82d9668f0751e201882acc0c0f16
[Test] (#2) Patch to set UUID in domain
Patch enables the user to set the UUID while defining a domain
Signed-off-by: Yogananth Subramanian <anantyog(a)linux.vnet.ibm.com>
diff -r ca99e2ff90ec -r 849bed1d2e46 suites/libvirt-cim/lib/XenKvmLib/vsms.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py Wed Aug 05 03:23:04 2009 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py Thu Aug 06 17:09:45 2009 -0700
@@ -91,7 +91,7 @@
# classes to define VSSD parameters
class CIM_VirtualSystemSettingData(CIMClassMOF):
- def __init__(self, name, virt, bldr=None, emulator=None):
+ def __init__(self, name, virt, uuid=None, bldr=None, emulator=None):
type = get_class_type(self.__class__.__name__)
self.InstanceID = '%s:%s' % (type, name)
self.Caption = self.Description = 'Virtual System'
@@ -116,6 +116,9 @@
if bldr is not None:
self.Bootloader = bldr
+ if uuid is not None:
+ self.UUID = uuid
+
class Xen_VirtualSystemSettingData(CIM_VirtualSystemSettingData):
pass
diff -r ca99e2ff90ec -r 849bed1d2e46 suites/libvirt-cim/lib/XenKvmLib/vxml.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Wed Aug 05 03:23:04 2009 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Thu Aug 06 17:09:45 2009 -0700
@@ -555,7 +555,7 @@
class VirtCIM:
- def __init__(self, virt, dom_name, disk_dev, disk_source,
+ def __init__(self, virt, dom_name, uuid, disk_dev, disk_source,
net_type, net_name, net_mac, vcpus, mem,
mem_allocunits, emu_type, grstype, ip,
port_num, kmap, irstype, btype, vnc_passwd):
@@ -563,7 +563,7 @@
self.domain_name = dom_name
self.err_rc = None
self.err_desc = None
- self.vssd = vsms.get_vssd_mof(virt, dom_name)
+ self.vssd = vsms.get_vssd_mof(virt, dom_name, uuid)
self.nasd = vsms.get_nasd_class(virt)(type=net_type,
mac=net_mac,
name=dom_name,
@@ -787,6 +787,7 @@
secondary_disk_path = const.Xen_secondary_disk_path
def __init__(self, test_dom=const.default_domname,
+ uuid=None,
mem=const.default_memory,
mem_allocunits=const.default_mallocunits,
vcpus=const.default_vcpus,
@@ -807,7 +808,7 @@
self._os(const.Xen_kernel_path, const.Xen_init_path)
self._devices(disk_file_path, disk, ntype, mac, net_name)
- VirtCIM.__init__(self, 'Xen', test_dom, disk, disk_file_path,
+ VirtCIM.__init__(self, 'Xen', test_dom, uuid, disk, disk_file_path,
ntype, net_name, mac, vcpus, mem, mem_allocunits,
emu_type, grstype, address, port_num, keymap, irstype,
btype, vnc_passwd)
@@ -852,6 +853,7 @@
secondary_disk_path = const.KVM_secondary_disk_path
def __init__(self, test_dom=const.default_domname,
+ uuid=None,
mem=const.default_memory,
mem_allocunits=const.default_mallocunits,
vcpus=const.default_vcpus,
@@ -867,7 +869,7 @@
logger.error('Error: Disk image does not exist')
sys.exit(1)
VirtXML.__init__(self, 'kvm', test_dom, set_uuid(), mem, vcpus)
- VirtCIM.__init__(self, 'KVM', test_dom, disk, disk_file_path,
+ VirtCIM.__init__(self, 'KVM', test_dom, uuid, disk, disk_file_path,
ntype, net_name, mac, vcpus, mem,
mem_allocunits, emu_type, grstype, address,
port_num, keymap, irstype, btype, vnc_passwd)
@@ -907,6 +909,7 @@
secondary_disk_path = const.XenFV_secondary_disk_path
def __init__(self, test_dom=const.default_domname,
+ uuid=None,
mem=const.default_memory,
mem_allocunits=const.default_mallocunits,
vcpus=const.default_vcpus,
@@ -922,7 +925,7 @@
logger.error('Error: Disk image does not exist')
sys.exit(1)
VirtXML.__init__(self, 'xenfv', test_dom, set_uuid(), mem, vcpus)
- VirtCIM.__init__(self, 'XenFV', test_dom, disk, disk_file_path,
+ VirtCIM.__init__(self, 'XenFV', test_dom, disk, uuid, disk_file_path,
ntype, net_name, mac, vcpus, mem, mem_allocunits,
emu_type, grstype, address, port_num, keymap,
irstype, btype, vnc_passwd)
@@ -967,6 +970,7 @@
class LXCXML(VirtXML, VirtCIM):
def __init__(self, test_dom=const.default_domname,
+ uuid=None,
mem=const.default_memory,
vcpus=const.default_vcpus,
mac=const.LXC_default_mac,
@@ -976,7 +980,7 @@
address="127.0.0.1", port_num='-1',
keymap="en-us",
irstype="mouse", btype="usb",
vnc_passwd=None):
VirtXML.__init__(self, 'lxc', test_dom, set_uuid(), mem, vcpus)
- VirtCIM.__init__(self, 'LXC', test_dom, const.LXC_default_mp,
+ VirtCIM.__init__(self, 'LXC', test_dom, uuid, const.LXC_default_mp,
const.LXC_default_source, ntype, net_name, mac, vcpus,
mem, const.default_mallocunits, None, grstype,
address, port_num, keymap, irstype, btype, vnc_passwd)
7:27 p.m.
New subject: [PATCH 2 of 2] [Test] (#2) Test case to test setting UUID by user
# HG changeset patch
# User anantyog(a)in.ibm.com
# Date 1249604247 25200
# Node ID 35ae4e3e49b5a6bc0b48d2068ed89d0838b1ecd7
# Parent 849bed1d2e467d6a2735e2c510ec0f40911c1554
[Test] (#2) Test case to test setting UUID by user
This test defines a domain with user specified UUID
Signed-off-by: Yogananth Subramanian <anantyog(a)linux.vnet.ibm.com>
diff -r 849bed1d2e46 -r 35ae4e3e49b5 suites/libvirt-cim/cimtest/VSSD/05_set_uuid.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/suites/libvirt-cim/cimtest/VSSD/05_set_uuid.py Thu Aug 06 17:17:27 2009 -0700
@@ -0,0 +1,91 @@
+#!/usr/bin/python
+#
+# Copyright 2009 IBM Corp.
+#
+# Authors:
+# Yogananth Subramanian <anantyog(a)linux.vnet.ibm.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#This test defines a domain with user specified UUID
+#
+
+import sys
+from XenKvmLib.test_doms import set_uuid
+from XenKvmLib import vsms
+from XenKvmLib import vxml
+from CimTest.Globals import logger
+from CimTest.ReturnCodes import PASS, FAIL
+from XenKvmLib.const import do_main
+from XenKvmLib.classes import get_typed_class
+from XenKvmLib.enumclass import GetInstance
+
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
+default_dom = 'uuid_domain'
+uuid = set_uuid()
+
+def get_vssd(ip, virt, get_cim_inst):
+ cn = get_typed_class(virt, "VirtualSystemSettingData")
+ inst = None
+
+ try:
+ if virt == "XenFV":
+ virt = "Xen"
+
+ key_list = {"InstanceID" : "%s:%s" % (virt, default_dom) }
+ inst = GetInstance(ip, cn, key_list, get_cim_inst)
+
+ except Exception, details:
+ logger.error(details)
+ return FAIL, inst
+
+ if inst is None:
+ return FAIL, inst
+
+ return PASS, inst
+
+@do_main(sup_types)
+def main():
+ options = main.options
+
+ service = vsms.get_vsms_class(options.virt)(options.ip)
+
+ cxml = vxml.get_class(options.virt)(default_dom, uuid=uuid)
+ ret = cxml.cim_define(options.ip)
+ if not ret:
+ logger.error("Failed to define the dom: %s", default_dom)
+ return FAIL
+
+ try:
+ status, inst = get_vssd(options.ip, options.virt, True)
+ if status != PASS:
+ raise Exception("Failed to get the VSSD instance for %s"%
+ default_dom)
+
+ if inst['UUID'] != uuid:
+ raise Exception(" UUID is differnet from the one set by the user")
+ else:
+ logger.info("UUID is same as the one set by the user")
+
+ except Exception, details:
+ logger.error(details)
+ status = FAIL
+
+ cxml.undefine(options.ip)
+ return status
+
+if __name__ == "__main__":
+ sys.exit(main())
+
5616
days inactive
5616
days old
2 comments
1 participants
participants (1)
-
Yogananth Subramanian