ruby-libvirt 0.3.0 → 0.4.0

data/tests/test_domain.rb

@@ -11,9 +11,6 @@ $: << File.dirname(__FILE__)
 require 'libvirt'
 require 'test_utils.rb'
 
-GUEST_DISK = '/var/lib/libvirt/images/ruby-libvirt-tester.qcow2'
-UUID = "93a5c045-6457-2c09-e56f-927cdf34e17a"
-
 conn = Libvirt::open("qemu:///system")
 
 # initial cleanup for previous runs
@@ -25,59 +22,8 @@ rescue
   # in case we didn't find it, don't do anything
 end
 
-# XML data for later tests
-new_dom_xml = <<EOF
-<domain type='kvm'>
-  <name>ruby-libvirt-tester</name>
-  <uuid>#{UUID}</uuid>
-  <memory>1048576</memory>
-  <currentMemory>1048576</currentMemory>
-  <vcpu>2</vcpu>
-  <os>
-    <type arch='x86_64'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <pae/>
-  </features>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2'/>
-      <source file='#{GUEST_DISK}'/>
-      <target dev='vda' bus='virtio'/>
-    </disk>
-    <interface type='bridge'>
-      <mac address='52:54:00:60:3c:95'/>
-      <source bridge='virbr0'/>
-      <model type='virtio'/>
-      <target dev='rl556'/>
-    </interface>
-    <serial type='pty'>
-      <target port='0'/>
-    </serial>
-    <console type='pty'>
-      <target port='0'/>
-    </console>
-    <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/>
-    <video>
-      <model type='cirrus' vram='9216' heads='1'/>
-    </video>
-  </devices>
-</domain>
-EOF
-
-# qemu command-line that roughly corresponds to the above XML
-qemu_cmd_line = "/usr/bin/qemu-kvm -S -M pc-0.13 -enable-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -name ruby-libvirt-tester -uuid #{UUID} -nodefconfig -nodefaults -chardev socket,id=monitor,path=/var/lib/libvirt/qemu/ruby-libvirt-tester.monitor,server,nowait -mon chardev=monitor,mode=readline -rtc base=utc -boot c -chardev pty,id=serial0 -device isa-serial,chardev=serial0 -usb -vnc 127.0.0.1:0 -k en-us -vga cirrus -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5"
-
 # setup for later tests
-`rm -f #{GUEST_DISK} ; qemu-img create -f qcow2 #{GUEST_DISK} 5G`
+`rm -f #{$GUEST_DISK} ; qemu-img create -f qcow2 #{$GUEST_DISK} 5G`
 `rm -f /var/lib/libvirt/images/ruby-libvirt-test.save`
 
 new_hostdev_xml = <<EOF
@@ -90,132 +36,8 @@ EOF
 
 # start tests
 
-# TESTGROUP: conn.num_of_domains
-expect_too_many_args(conn, "num_of_domains", 1)
-expect_success(conn, "no args", "num_of_domains")
-
-# TESTGROUP: conn.list_domains
-expect_too_many_args(conn, "list_domains", 1)
-expect_success(conn, "no args", "list_domains")
-
-# TESTGROUP: conn.num_of_defined_domains
-expect_too_many_args(conn, "num_of_defined_domains", 1)
-expect_success(conn, "no args", "num_of_defined_domains")
-
-# TESTGROUP: conn.list_domains
-expect_too_many_args(conn, "list_defined_domains", 1)
-expect_success(conn, "no args", "list_defined_domains")
-
-# TESTGROUP: conn.create_domain_linux
-expect_too_many_args(conn, "create_domain_linux", new_dom_xml, 0, 1)
-expect_too_few_args(conn, "create_domain_linux")
-expect_invalid_arg_type(conn, "create_domain_linux", nil)
-expect_invalid_arg_type(conn, "create_domain_linux", 1)
-expect_invalid_arg_type(conn, "create_domain_linux", new_dom_xml, "foo")
-expect_fail(conn, Libvirt::Error, "invalid xml", "create_domain_linux", "hello")
-newdom = expect_success(conn, "domain xml", "create_domain_linux", new_dom_xml) {|x| x.class == Libvirt::Domain}
-sleep 1
-
-expect_fail(conn, Libvirt::Error, "already existing domain", "create_domain_linux", new_dom_xml)
-
-newdom.destroy
-
-# TESTGROUP: conn.create_domain_xml
-expect_too_many_args(conn, "create_domain_xml", new_dom_xml, 0, 1)
-expect_too_few_args(conn, "create_domain_xml")
-expect_invalid_arg_type(conn, "create_domain_xml", nil)
-expect_invalid_arg_type(conn, "create_domain_xml", 1)
-expect_invalid_arg_type(conn, "create_domain_xml", new_dom_xml, "foo")
-expect_fail(conn, Libvirt::Error, "invalid xml", "create_domain_xml", "hello")
-newdom = expect_success(conn, "domain xml", "create_domain_xml", new_dom_xml) {|x| x.class == Libvirt::Domain}
-sleep 1
-
-expect_fail(conn, Libvirt::Error, "already existing domain", "create_domain_xml", new_dom_xml)
-
-newdom.destroy
-
-# TESTGROUP: conn.lookup_domain_by_name
-newdom = conn.create_domain_xml(new_dom_xml)
-sleep 1
-
-expect_too_many_args(conn, "lookup_domain_by_name", 1, 2)
-expect_too_few_args(conn, "lookup_domain_by_name")
-expect_invalid_arg_type(conn, "lookup_domain_by_name", 1)
-expect_fail(conn, Libvirt::RetrieveError, "non-existent name arg", "lookup_domain_by_name", "foobarbazsucker")
-
-expect_success(conn, "name arg for running domain", "lookup_domain_by_name", "ruby-libvirt-tester") {|x| x.name == "ruby-libvirt-tester"}
-newdom.destroy
-
-newdom = conn.define_domain_xml(new_dom_xml)
-expect_success(conn, "name arg for defined domain", "lookup_domain_by_name", "ruby-libvirt-tester") {|x| x.name == "ruby-libvirt-tester"}
-newdom.undefine
-
-# TESTGROUP: conn.lookup_domain_by_id
-newdom = conn.create_domain_xml(new_dom_xml)
-sleep 1
-
-expect_too_many_args(conn, "lookup_domain_by_id", 1, 2)
-expect_too_few_args(conn, "lookup_domain_by_id")
-expect_invalid_arg_type(conn, "lookup_domain_by_id", "foo")
-expect_fail(conn, Libvirt::Error, "with negative value", "lookup_domain_by_id", -1)
-
-expect_success(conn, "id arg for running domain", "lookup_domain_by_id", newdom.id)
-newdom.destroy
-
-# TESTGROUP: conn.lookup_domain_by_uuid
-newdom = conn.create_domain_xml(new_dom_xml)
-sleep 1
-
-expect_too_many_args(conn, "lookup_domain_by_uuid", 1, 2)
-expect_too_few_args(conn, "lookup_domain_by_uuid")
-expect_invalid_arg_type(conn, "lookup_domain_by_uuid", 1)
-expect_fail(conn, Libvirt::RetrieveError, "invalid UUID", "lookup_domain_by_uuid", "abcd")
-
-expect_success(conn, "UUID arg for running domain", "lookup_domain_by_uuid", newdom.uuid) {|x| x.uuid == UUID}
-newdom.destroy
-
-newdom = conn.define_domain_xml(new_dom_xml)
-expect_success(conn, "UUID arg for defined domain", "lookup_domain_by_uuid", newdom.uuid) {|x| x.uuid == UUID}
-newdom.undefine
-
-# TESTGROUP: conn.define_domain_xml
-expect_too_many_args(conn, "define_domain_xml", 1, 2)
-expect_too_few_args(conn, "define_domain_xml")
-expect_invalid_arg_type(conn, "define_domain_xml", 1)
-expect_invalid_arg_type(conn, "define_domain_xml", nil)
-expect_fail(conn, Libvirt::DefinitionError, "invalid XML", "define_domain_xml", "hello")
-
-newdom = expect_success(conn, "domain xml arg", "define_domain_xml", new_dom_xml)
-newdom.undefine
-
-# TESTGROUP: conn.domain_xml_from_native
-expect_too_many_args(conn, "domain_xml_from_native", 1, 2, 3, 4)
-expect_too_few_args(conn, "domain_xml_from_native")
-expect_too_few_args(conn, "domain_xml_from_native", 1)
-expect_invalid_arg_type(conn, "domain_xml_from_native", 1, 2)
-expect_invalid_arg_type(conn, "domain_xml_from_native", nil, 2)
-expect_invalid_arg_type(conn, "domain_xml_from_native", "qemu-argv", 2)
-expect_invalid_arg_type(conn, "domain_xml_from_native", "qemu-argv", nil)
-expect_invalid_arg_type(conn, "domain_xml_from_native", "qemu-argv", "foo", "bar")
-expect_fail(conn, Libvirt::Error, "unsupported first arg", "domain_xml_from_native", "foo", "bar")
-
-expect_success(conn, "qemu-argv and qemu_cmd_line", "domain_xml_from_native", "qemu-argv", qemu_cmd_line)
-
-# TESTGROUP: conn.domain_xml_to_native
-expect_too_many_args(conn, "domain_xml_to_native", 1, 2, 3, 4)
-expect_too_few_args(conn, "domain_xml_to_native")
-expect_too_few_args(conn, "domain_xml_to_native", 1)
-expect_invalid_arg_type(conn, "domain_xml_to_native", 1, 2)
-expect_invalid_arg_type(conn, "domain_xml_to_native", nil, 2)
-expect_invalid_arg_type(conn, "domain_xml_to_native", "qemu-argv", 2)
-expect_invalid_arg_type(conn, "domain_xml_to_native", "qemu-argv", nil)
-expect_invalid_arg_type(conn, "domain_xml_to_native", "qemu-argv", "foo", "bar")
-expect_fail(conn, Libvirt::Error, "unsupported first arg", "domain_xml_to_native", "foo", "bar")
-
-expect_success(conn, "qemu-argv and domain XML", "domain_xml_to_native", "qemu-argv", new_dom_xml)
-
 # TESTGROUP: dom.migrate
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 dconn = Libvirt::open("qemu:///system")
@@ -236,7 +58,7 @@ dconn.close
 newdom.destroy
 
 # TESTGROUP: dom.migrate_to_uri
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "migrate_to_uri", 1, 2, 3, 4, 5)
@@ -253,7 +75,7 @@ dconn.close
 newdom.destroy
 
 # TESTGROUP: dom.migrate_set_max_downtime
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "migrate_set_max_downtime", 1, 2, 3)
 expect_too_few_args(newdom, "migrate_set_max_downtime")
@@ -263,7 +85,7 @@ expect_fail(newdom, Libvirt::Error, "on off domain", "migrate_set_max_downtime",
 
 newdom.undefine
 
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 expect_fail(newdom, Libvirt::Error, "while no migration in progress", "migrate_set_max_downtime", 10)
 
@@ -273,7 +95,7 @@ expect_fail(newdom, Libvirt::Error, "while no migration in progress", "migrate_s
 newdom.destroy
 
 # TESTGROUP: dom.shutdown
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "shutdown", 1)
@@ -282,7 +104,7 @@ sleep 1
 newdom.destroy
 
 # TESTGROUP: dom.reboot
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 expect_too_many_args(newdom, "reboot", 1, 2)
 expect_invalid_arg_type(newdom, "reboot", "hello")
@@ -299,14 +121,14 @@ sleep 1
 newdom.destroy
 
 # TESTGROUP: dom.destroy
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "destroy", 1)
 expect_success(newdom, "no args", "destroy")
 
 # TESTGROUP: dom.suspend
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "suspend", 1)
@@ -314,7 +136,7 @@ expect_success(newdom, "no args", "suspend")
 newdom.destroy
 
 # TESTGROUP: dom.resume
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_success(newdom, "no args running domain", "resume")
@@ -325,7 +147,7 @@ expect_success(newdom, "no args suspended domain", "resume")
 newdom.destroy
 
 # TESTGROUP: dom.save
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 newdom.create
 sleep 1
 
@@ -341,7 +163,7 @@ expect_success(newdom, "path arg", "save", "/var/lib/libvirt/images/ruby-libvirt
 newdom.undefine
 
 # TESTGROUP: dom.managed_save
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 newdom.create
 sleep 1
 
@@ -351,7 +173,7 @@ expect_success(newdom, "no args", "managed_save")
 newdom.undefine
 
 # TESTGROUP: dom.has_managed_save?
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 newdom.create
 sleep 1
 
@@ -375,7 +197,7 @@ end
 newdom.undefine
 
 # TESTGROUP: dom.managed_save_remove
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 newdom.create
 sleep 1
 newdom.managed_save
@@ -396,7 +218,7 @@ end
 newdom.undefine
 
 # TESTGROUP: dom.core_dump
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 newdom.create
 sleep 1
 
@@ -419,7 +241,7 @@ expect_fail(newdom, Libvirt::Error, "of shut-off domain", "core_dump", "/var/lib
 newdom.undefine
 
 # TESTGROUP: Libvirt::Domain::restore
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 newdom.create
 sleep 1
 newdom.save("/var/lib/libvirt/images/ruby-libvirt-test.save")
@@ -441,7 +263,7 @@ newdom.destroy
 newdom.undefine
 
 # TESTGROUP: dom.info
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "info", 1)
@@ -451,7 +273,7 @@ expect_success(newdom, "no args", "info") {|x| x.state == Libvirt::Domain::RUNNI
 newdom.destroy
 
 # TESTGROUP: dom.security_label
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "security_label", 1)
@@ -461,7 +283,7 @@ expect_success(newdom, "no args", "security_label")
 newdom.destroy
 
 # TESTGROUP: dom.block_stats
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "block_stats", 1, 2)
@@ -474,7 +296,7 @@ expect_success(newdom, "block device arg", "block_stats", "vda")
 newdom.destroy
 
 # TESTGROUP: dom.memory_stats
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "memory_stats", 1, 2)
@@ -485,7 +307,7 @@ expect_success(newdom, "no args", "memory_stats")
 newdom.destroy
 
 # TESTGROUP: dom.blockinfo
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "blockinfo", 1, 2, 3)
@@ -494,12 +316,12 @@ expect_invalid_arg_type(newdom, "blockinfo", 1)
 expect_invalid_arg_type(newdom, "blockinfo", "foo", "bar")
 expect_fail(newdom, Libvirt::RetrieveError, "invalid path", "blockinfo", "foo")
 
-expect_success(newdom, "path arg", "blockinfo", GUEST_DISK)
+expect_success(newdom, "path arg", "blockinfo", $GUEST_DISK)
 
 newdom.destroy
 
 # TESTGROUP: dom.block_peek
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "block_peek", 1, 2, 3, 4, 5)
@@ -512,7 +334,7 @@ expect_invalid_arg_type(newdom, "block_peek", "foo", 0, "bar")
 expect_invalid_arg_type(newdom, "block_peek", "foo", 0, 512, "baz")
 expect_fail(newdom, Libvirt::RetrieveError, "invalid path", "block_peek", "foo", 0, 512)
 
-blockpeek = newdom.block_peek(GUEST_DISK, 0, 512)
+blockpeek = newdom.block_peek($GUEST_DISK, 0, 512)
 
 # 51 46 49 fb are the first 4 bytes of a qcow2 image
 if blockpeek[0] != 0x51 or blockpeek[1] != 0x46 or blockpeek[2] != 0x49 or
@@ -525,7 +347,7 @@ end
 newdom.destroy
 
 # TESTGROUP: dom.memory_peek
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "memory_peek", 1, 2, 3, 4)
@@ -536,12 +358,11 @@ expect_invalid_arg_type(newdom, "memory_peek", 0, "bar")
 expect_invalid_arg_type(newdom, "memory_peek", 0, 512, "baz")
 
 expect_success(newdom, "offset and size args", "memory_peek", 0, 512)
-puts_ok "dom.memory_peek succeeded"
 
 newdom.destroy
 
 # TESTGROUP: dom.get_vcpus
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "get_vcpus", 1)
@@ -551,7 +372,7 @@ expect_success(newdom, "no args", "get_vcpus") {|x| x.length == 2}
 newdom.destroy
 
 # TESTGROUP: dom.active?
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "active?", 1)
@@ -560,7 +381,7 @@ expect_success(newdom, "no args", "active?") {|x| x == true}
 
 newdom.destroy
 
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_success(newdom, "no args", "active?") {|x| x == false}
 
@@ -573,7 +394,7 @@ newdom.destroy
 newdom.undefine
 
 # TESTGROUP: dom.persistent?
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "persistent?", 1)
@@ -582,14 +403,14 @@ expect_success(newdom, "no args", "persistent?") {|x| x == false}
 
 newdom.destroy
 
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_success(newdom, "no args", "persistent?") {|x| x == true}
 
 newdom.undefine
 
 # TESTGROUP: dom.ifinfo
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "ifinfo", 1, 2)
@@ -602,7 +423,7 @@ expect_success(newdom, "interface arg", "ifinfo", "rl556")
 newdom.destroy
 
 # TESTGROUP: dom.name
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "name", 1)
@@ -612,7 +433,7 @@ expect_success(newdom, "no args", "name") {|x| x == "ruby-libvirt-tester"}
 newdom.destroy
 
 # TESTGROUP: dom.id
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "id", 1)
@@ -622,17 +443,17 @@ expect_success(newdom, "no args", "id")
 newdom.destroy
 
 # TESTGROUP: dom.uuid
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "uuid", 1)
 
-expect_success(newdom, "no args", "uuid") {|x| x == UUID}
+expect_success(newdom, "no args", "uuid") {|x| x == $GUEST_UUID}
 
 newdom.destroy
 
 # TESTGROUP: dom.os_type
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "os_type", 1)
@@ -642,7 +463,7 @@ expect_success(newdom, "no args", "os_type") {|x| x == "hvm"}
 newdom.destroy
 
 # TESTGROUP: dom.max_memory
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "max_memory", 1)
@@ -652,7 +473,7 @@ expect_success(newdom, "no args", "max_memory") {|x| x == 1048576}
 newdom.destroy
 
 # TESTGROUP: dom.max_memory=
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "max_memory=", 1, 2)
 expect_too_few_args(newdom, "max_memory=")
@@ -671,7 +492,7 @@ end
 newdom.undefine
 
 # TESTGROUP: dom.memory=
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "memory=", 1, 2)
 expect_too_few_args(newdom, "memory=")
@@ -681,7 +502,7 @@ expect_fail(newdom, Libvirt::Error, "shutoff domain", "memory=", 2)
 
 newdom.undefine
 
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_success(newdom, "number arg", "memory=", 200000)
@@ -689,7 +510,7 @@ expect_success(newdom, "number arg", "memory=", 200000)
 newdom.destroy
 
 # TESTGROUP: dom.max_vcpus
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "max_vcpus", 1)
@@ -699,7 +520,7 @@ expect_success(newdom, "no args", "max_vcpus")
 newdom.destroy
 
 # TESTGROUP: dom.vcpus=
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "vcpus=", 1, 2)
 expect_too_few_args(newdom, "vcpus=")
@@ -709,7 +530,7 @@ expect_fail(newdom, Libvirt::Error, "shutoff domain", "vcpus=", 2)
 
 newdom.undefine
 
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 # FIXME: this kills the domain for some reason
@@ -718,7 +539,7 @@ sleep 1
 newdom.destroy
 
 # TESTGROUP: dom.pin_vcpu
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "pin_vcpu", 1, 2, 3)
@@ -731,7 +552,7 @@ expect_success(newdom, "cpu args", "pin_vcpu", 0, [0])
 newdom.destroy
 
 # TESTGROUP: dom.xml_desc
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_too_many_args(newdom, "xml_desc", 1, 2)
@@ -742,14 +563,14 @@ expect_success(newdom, "no args", "xml_desc")
 newdom.destroy
 
 # TESTGROUP: dom.undefine
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "undefine", 1)
 
 expect_success(newdom, "no args", "undefine")
 
 # TESTGROUP: dom.create
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "create", 1, 2)
 expect_invalid_arg_type(newdom, "create", "foo")
@@ -762,7 +583,7 @@ newdom.destroy
 newdom.undefine
 
 # TESTGROUP: dom.autostart?
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "autostart?", 1)
 
@@ -775,7 +596,7 @@ expect_success(newdom, "no args", "autostart?") {|x| x == true}
 newdom.undefine
 
 # TESTGROUP: dom.autostart=
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "autostart=", 1, 2)
 expect_invalid_arg_type(newdom, "autostart=", 'foo')
@@ -799,7 +620,7 @@ end
 newdom.undefine
 
 # TESTGROUP: dom.attach_device
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "attach_device", 1, 2, 3)
 expect_too_few_args(newdom, "attach_device")
@@ -810,7 +631,7 @@ expect_fail(newdom, Libvirt::Error, "shut off domain", "attach_device", new_host
 
 newdom.undefine
 
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 #expect_success(newdom, "hostdev XML", "attach_device", new_hostdev_xml)
@@ -818,7 +639,7 @@ sleep 1
 newdom.destroy
 
 # TESTGROUP: dom.detach_device
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "detach_device", 1, 2, 3)
 expect_too_few_args(newdom, "detach_device")
@@ -829,7 +650,7 @@ expect_fail(newdom, Libvirt::Error, "shut off domain", "detach_device", new_host
 
 newdom.undefine
 
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 #expect_success(newdom, "hostdev XML", "detach_device", new_hostdev_xml)
@@ -837,7 +658,7 @@ sleep 1
 newdom.destroy
 
 # TESTGROUP: dom.update_device
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "update_device", 1, 2, 3)
 expect_too_few_args(newdom, "update_device")
@@ -848,7 +669,7 @@ expect_fail(newdom, Libvirt::Error, "shut off domain", "update_device", new_host
 
 newdom.undefine
 
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 #expect_success(newdom, "hostdev XML", "update_device", new_hostdev_xml)
@@ -856,7 +677,7 @@ sleep 1
 newdom.destroy
 
 # TESTGROUP: dom.free
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 newdom.undefine
 expect_too_many_args(newdom, "free", 1)
 
@@ -864,7 +685,7 @@ newdom.free
 puts_ok "dom.free succeeded"
 
 # TESTGROUP: dom.snapshot_create_xml
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "snapshot_create_xml", 1, 2, 3)
 expect_too_few_args(newdom, "snapshot_create_xml")
@@ -884,7 +705,7 @@ end
 newdom.undefine
 
 # TESTGROUP: dom.num_of_snapshots
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "num_of_snapshots", 1, 2)
 expect_invalid_arg_type(newdom, "num_of_snapshots", 'foo')
@@ -898,7 +719,7 @@ expect_success(newdom, "no args", "num_of_snapshots") {|x| x == 1}
 newdom.undefine
 
 # TESTGROUP: dom.list_snapshots
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "list_snapshots", 1, 2)
 expect_invalid_arg_type(newdom, "list_snapshots", 'foo')
@@ -912,7 +733,7 @@ expect_success(newdom, "no args", "list_snapshots") {|x| x.length == 1}
 newdom.undefine
 
 # TESTGROUP: dom.lookup_snapshot_by_name
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 newdom.snapshot_create_xml("<domainsnapshot><name>foo</name></domainsnapshot>")
 
 expect_too_many_args(newdom, "lookup_snapshot_by_name", 1, 2, 3)
@@ -925,7 +746,7 @@ expect_success(newdom, "name arg", "lookup_snapshot_by_name", "foo")
 newdom.undefine
 
 # TESTGROUP: dom.has_current_snapshot?
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "has_current_snapshot?", 1, 2)
 expect_invalid_arg_type(newdom, "has_current_snapshot?", 'foo')
@@ -939,7 +760,7 @@ expect_success(newdom, "no args", "has_current_snapshot?") {|x| x == true}
 newdom.undefine
 
 # TESTGROUP: dom.revert_to_snapshot
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "revert_to_snapshot", 1, 2, 3)
 expect_too_few_args(newdom, "revert_to_snapshot")
@@ -957,7 +778,7 @@ expect_success(newdom, "snapshot arg", "revert_to_snapshot", snap)
 newdom.undefine
 
 # TESTGROUP: dom.current_snapshot
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "current_snapshot", 1, 2)
 expect_invalid_arg_type(newdom, "current_snapshot", 'foo')
@@ -970,7 +791,7 @@ expect_success(newdom, "no args", "current_snapshot")
 newdom.undefine
 
 # TESTGROUP: snapshot.xml_desc
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 snap = newdom.snapshot_create_xml("<domainsnapshot/>")
 
 expect_too_many_args(snap, "xml_desc", 1, 2)
@@ -981,7 +802,7 @@ expect_success(newdom, "no args", "xml_desc")
 newdom.undefine
 
 # TESTGROUP: snapshot.delete
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 snap = newdom.snapshot_create_xml("<domainsnapshot/>")
 
 expect_too_many_args(snap, "delete", 1, 2)
@@ -992,14 +813,14 @@ expect_success(snap, "no args", "delete")
 newdom.undefine
 
 # TESTGROUP: snapshot.free
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 newdom.undefine
 expect_too_many_args(newdom, "free", 1)
 
 expect_success(newdom, "no args", "free")
 
 # TESTGROUP: dom.job_info
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "job_info", 1)
 
@@ -1007,7 +828,7 @@ expect_fail(newdom, Libvirt::RetrieveError, "shutoff domain", "job_info")
 
 newdom.undefine
 
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_success(newdom, "no args", "job_info")
@@ -1015,7 +836,7 @@ expect_success(newdom, "no args", "job_info")
 newdom.destroy
 
 # TESTGROUP: dom.abort_job
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "abort_job", 1)
 
@@ -1023,7 +844,7 @@ expect_fail(newdom, Libvirt::Error, "not running domain", "abort_job")
 
 newdom.undefine
 
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_fail(newdom, Libvirt::Error, "no active job", "abort_job")
@@ -1034,7 +855,7 @@ expect_fail(newdom, Libvirt::Error, "no active job", "abort_job")
 newdom.destroy
 
 # TESTGROUP: dom.scheduler_type
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "scheduler_type", 1)
 
@@ -1051,7 +872,7 @@ end
 newdom.undefine
 
 # TESTGROUP: dom.scheduler_parameters
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "scheduler_parameters", 1)
 
@@ -1068,18 +889,72 @@ end
 newdom.undefine
 
 # TESTGROUP: dom.scheduler_parameters=
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "scheduler_parameters=", 1, 2)
 expect_too_few_args(newdom, "scheduler_parameters=")
 expect_invalid_arg_type(newdom, "scheduler_parameters=", 0)
 
-# FIXME: set scheduler_parameters here
+begin
+  newdom.scheduler_parameters={"cpu_shares"=>512}
+rescue NoMethodError
+  puts_skipped "dom.scheduler_parameters= does not exist"
+rescue Libvirt::RetrieveError
+  # this may not be supported (if cgroups aren't configured), so skip it
+  puts_ok "dom.scheduler_parameters= not supported"
+end
 
 newdom.undefine
 
+# TESTGROUP: dom.qemu_monitor_command
+new_test_xml = <<EOF
+<domain type='test'>
+  <name>fc4</name>
+  <uuid>EF86180145B911CB88E3AFBFE5370493</uuid>
+  <os>
+    <type>xen</type>
+    <kernel>/boot/vmlinuz-2.6.15-1.43_FC5guest</kernel>
+    <initrd>/boot/initrd-2.6.15-1.43_FC5guest.img</initrd>
+    <root>/dev/sda1</root>
+    <cmdline> ro selinux=0 3</cmdline>
+  </os>
+  <memory>261072</memory>
+  <currentMemory>131072</currentMemory>
+  <vcpu>1</vcpu>
+  <devices>
+    <disk type='file'>
+      <source file='/u/fc4.img'/>
+      <target dev='sda1'/>
+    </disk>
+    <interface type='bridge'>
+      <source bridge='xenbr0'/>
+      <mac address='aa:00:00:00:00:11'/>
+      <script path='/etc/xen/scripts/vif-bridge'/>
+    </interface>
+    <console tty='/dev/pts/5'/>
+  </devices>
+</domain>
+EOF
+
+newdom = conn.create_domain_xml($new_dom_xml)
+
+expect_too_many_args(newdom, "qemu_monitor_command", 1, 2, 3)
+expect_too_few_args(newdom, "qemu_monitor_command")
+expect_invalid_arg_type(newdom, "qemu_monitor_command", 1)
+expect_invalid_arg_type(newdom, "qemu_monitor_command", "foo", "bar")
+testconn = Libvirt::open("test:///default")
+fakedom = testconn.create_domain_xml(new_test_xml)
+expect_invalid_arg_type(fakedom, "qemu_monitor_command", "foo")
+fakedom.destroy
+testconn.close
+expect_fail(newdom, Libvirt::RetrieveError, "invalid command", "qemu_monitor_command", "foo")
+
+expect_success(newdom, "monitor command", "qemu_monitor_command", '{"execute":"query-cpus"}')
+
+newdom.destroy
+
 # TESTGROUP: dom.num_vcpus
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "num_vcpus", 1, 2)
 expect_too_few_args(newdom, "num_vcpus")
@@ -1091,7 +966,7 @@ expect_success(newdom, "config flag", "num_vcpus", Libvirt::Domain::VCPU_CONFIG)
 
 newdom.undefine
 
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_success(newdom, "config flag on transient domain", "num_vcpus", Libvirt::Domain::VCPU_CONFIG)
@@ -1100,7 +975,7 @@ expect_success(newdom, "live flag on transient domain", "num_vcpus", Libvirt::Do
 newdom.destroy
 
 # TESTGROUP: dom.vcpus_flags=
-newdom = conn.define_domain_xml(new_dom_xml)
+newdom = conn.define_domain_xml($new_dom_xml)
 
 expect_too_many_args(newdom, "vcpus_flags=", 1, 2, 3)
 expect_too_few_args(newdom, "vcpus_flags=")
@@ -1114,14 +989,105 @@ expect_success(newdom, "2 vcpu config", "vcpus_flags=", [2, Libvirt::Domain::VCP
 
 newdom.undefine
 
-newdom = conn.create_domain_xml(new_dom_xml)
+newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
 
 expect_fail(newdom, Libvirt::Error, "vcpu config on transient domain", "vcpus_flags=", [2, Libvirt::Domain::VCPU_CONFIG])
 expect_fail(newdom, Libvirt::Error, "too many vcpus", "vcpus_flags=", [4, Libvirt::Domain::VCPU_LIVE])
 
 # FIXME: this doesn't work for some reason
-#expect_success(newdom, "vcpus to 1", "vcpus_flags", [1,Libvirt::Domain::VCPU_LIVE])
+#expect_success(newdom, "vcpus to 1", "vcpus_flags=", [1, Libvirt::Domain::VCPU_LIVE])
+
+newdom.destroy
+
+# TESTGROUP: dom.memory_parameters=
+newdom = conn.define_domain_xml($new_dom_xml)
+
+expect_too_many_args(newdom, "memory_parameters=", 1, 2, 3)
+expect_too_few_args(newdom, "memory_parameters=")
+expect_invalid_arg_type(newdom, "memory_parameters=", 0)
+expect_fail(newdom, ArgumentError, "empty array", "memory_parameters=", [])
+expect_invalid_arg_type(newdom, "memory_parameters=", [1, 0])
+expect_invalid_arg_type(newdom, "memory_parameters=", [{}, "foo"])
+
+begin
+  newdom.memory_parameters={"soft_limit" => 9007199254740999, "swap_hard_limit" => 9007199254740999}
+rescue NoMethodError
+  puts_skipped "dom.memory_parameters= does not exist"
+rescue Libvirt::RetrieveError
+  # this may not be supported (if cgroups aren't configured), so skip it
+  puts_skipped "memory_parameters= not supported"
+end
+
+newdom.undefine
+
+# TESTGROUP: dom.memory_parameters
+newdom = conn.define_domain_xml($new_dom_xml)
+
+expect_too_many_args(newdom, "memory_parameters", 1, 2)
+
+begin
+  newdom.memory_parameters
+  puts_ok "dom.memory_parameters succeeded"
+rescue NoMethodError
+  puts_skipped "memory_parameters does not exist"
+rescue Libvirt::RetrieveError
+  # this may not be supported (if cgroups aren't configured), so skip it
+  puts_skipped "memory_parameters not supported"
+end
+
+newdom.undefine
+
+# TESTGROUP: dom.blkio_parameters=
+newdom = conn.define_domain_xml($new_dom_xml)
+
+expect_too_many_args(newdom, "blkio_parameters=", 1, 2, 3)
+expect_too_few_args(newdom, "blkio_parameters=")
+expect_invalid_arg_type(newdom, "blkio_parameters=", 0)
+expect_fail(newdom, ArgumentError, "empty array", "blkio_parameters=", [])
+expect_invalid_arg_type(newdom, "blkio_parameters=", [1, 0])
+expect_invalid_arg_type(newdom, "blkio_parameters=", [{}, "foo"])
+
+begin
+  newdom.blkio_parameters={"weight" => 1}
+rescue NoMethodError
+  puts_skipped "blkio_parameters= does not exist"
+rescue Libvirt::RetrieveError
+  # this may not be supported (if cgroups aren't configured), so skip it
+  puts_skipped "blkio_parameters= not supported"
+end
+
+newdom.undefine
+
+# TESTGROUP: dom.blkio_parameters
+newdom = conn.define_domain_xml($new_dom_xml)
+
+expect_too_many_args(newdom, "blkio_parameters", 1, 2)
+
+begin
+  newdom.blkio_parameters
+  puts_ok "dom.blkio_parameters succeeded"
+rescue NoMethodError
+  puts_skipped "blkio_parameters does not exist"
+rescue Libvirt::RetrieveError
+  # this may not be supported (if cgroups aren't configured), so skip it
+  puts_skipped "blkio_parameters not supported"
+end
+
+newdom.undefine
+
+# TESTGROUP: dom.open_console
+newdom = conn.create_domain_xml(new_dom_xml)
+stream = conn.stream
+
+expect_too_many_args(newdom, "open_console", 1, 2, 3, 4)
+expect_too_few_args(newdom, "open_console")
+expect_too_few_args(newdom, "open_console", 1)
+expect_invalid_arg_type(newdom, "open_console", 1, stream)
+expect_invalid_arg_type(newdom, "open_console", "pty", 1)
+expect_invalid_arg_type(newdom, "open_console", "pty", stream, "wow")
+
+expect_success(newdom, "device and stream args", "open_console", "pty", stream)
 
 newdom.destroy