ruby-libvirt 0.3.0 → 0.4.0

data/tests/test_open.rb

@@ -80,15 +80,12 @@ begin
     res
   end
 
-  puts "OK: open_auth uri, creds, userdata, auth block succeeded"
-  $SUCCESS = $SUCCESS + 1
+  puts_ok "open_auth uri, creds, userdata, auth block succeeded"
   conn.close
 rescue NoMethodError
-  puts "SKIPPED: open_auth does not exist"
-  $SKIPPED = $SKIPPED + 1
+  puts_skipped "open_auth does not exist"
 rescue => e
-  puts "FAIL: open_auth uri, creds, userdata, auth block expected to succeed, threw #{e.class.to_s}: #{e.to_s}"
-  $FAIL = $FAIL + 1
+  puts_fail "open_auth uri, creds, userdata, auth block expected to succeed, threw #{e.class.to_s}: #{e.to_s}"
 end
 
 # equivalent to "expect_success"
@@ -112,54 +109,14 @@ begin
     res
   end
 
-  puts "OK: open_auth uri, creds, userdata, R/O flag, auth block succeeded"
-  $SUCCESS = $SUCCESS + 1
+  puts_ok "open_auth uri, creds, userdata, R/O flag, auth block succeeded"
   conn.close
 rescue NoMethodError
-  puts "SKIPPED: open_auth does not exist"
-  $SKIPPED = $SKIPPED + 1
+  puts_skipped "open_auth does not exist"
 rescue => e
-  puts "FAIL: open_auth uri, creds, userdata, R/O flag, auth block expected to succeed, threw #{e.class.to_s}: #{e.to_s}"
-  $FAIL = $FAIL + 1
+  puts_fail "open_auth uri, creds, userdata, R/O flag, auth block expected to succeed, threw #{e.class.to_s}: #{e.to_s}"
 end
 
-# TESTGROUP: Libvirt::event_register_impl
-expect_too_many_args(Libvirt, "event_register_impl", 1, 2, 3, 4, 5, 6, 7)
-expect_invalid_arg_type(Libvirt, "event_register_impl", 1)
-
-# symbol callbacks
-def virEventAddHandleImpl(fd, events, opaque)
-end
-def virEventUpdateHandleImpl(watch, event)
-end
-def virEventRemoveHandleImpl(handleID)
-end
-def virEventAddTimerImpl(interval, opaque)
-end
-def virEventUpdateTimerImpl(timer, timeout)
-end
-def virEventRemoveTimerImpl(timerID)
-end
-
-# proc callbacks
-virEventAddHandleProc = lambda {|fd, events, opaque|
-}
-virEventUpdateHandleProc = lambda {|watch, event|
-}
-virEventRemoveHandleProc = lambda {|handleID|
-}
-virEventAddTimerProc = lambda {|interval, opaque|
-}
-virEventUpdateTimerProc = lambda {|timer, timeout|
-}
-virEventRemoveTimerProc = lambda {|timerID|
-}
-
-expect_success(Libvirt, "all Symbol callbacks", "event_register_impl", :virEventAddHandleImpl, :virEventUpdateHandleImpl, :virEventRemoveHandleImpl, :virEventAddTimerImpl, :virEventUpdateTimerImpl, :virEventRemoveTimerImpl)
-expect_success(Libvirt, "unregister all callbacks", "event_register_impl", nil, nil, nil, nil, nil, nil)
-expect_success(Libvirt, "all Proc callbacks", "event_register_impl", virEventAddHandleProc, virEventUpdateHandleProc, virEventRemoveHandleProc, virEventAddTimerProc, virEventUpdateTimerProc, virEventRemoveTimerProc)
-expect_success(Libvirt, "unregister all callbacks", "event_register_impl")
-
 # TESTGROUP: Libvirt::event_invoke_handle_callback
 conn = Libvirt::open("qemu:///system")
 
@@ -200,4 +157,41 @@ expect_invalid_arg_type(Libvirt, "event_invoke_timeout_callback", 1, { "libvirt_
 expect_invalid_arg_type(Libvirt, "event_invoke_timeout_callback", 1, { "libvirt_cb" => conn, "opaque" => "hello" })
 conn.close
 
+# TESTGROUP: Libvirt::event_register_impl
+expect_too_many_args(Libvirt, "event_register_impl", 1, 2, 3, 4, 5, 6, 7)
+expect_invalid_arg_type(Libvirt, "event_register_impl", 1)
+
+# symbol callbacks
+def virEventAddHandleImpl(fd, events, opaque)
+end
+def virEventUpdateHandleImpl(watch, event)
+end
+def virEventRemoveHandleImpl(handleID)
+end
+def virEventAddTimerImpl(interval, opaque)
+end
+def virEventUpdateTimerImpl(timer, timeout)
+end
+def virEventRemoveTimerImpl(timerID)
+end
+
+# proc callbacks
+virEventAddHandleProc = lambda {|fd, events, opaque|
+}
+virEventUpdateHandleProc = lambda {|watch, event|
+}
+virEventRemoveHandleProc = lambda {|handleID|
+}
+virEventAddTimerProc = lambda {|interval, opaque|
+}
+virEventUpdateTimerProc = lambda {|timer, timeout|
+}
+virEventRemoveTimerProc = lambda {|timerID|
+}
+
+expect_success(Libvirt, "all Symbol callbacks", "event_register_impl", :virEventAddHandleImpl, :virEventUpdateHandleImpl, :virEventRemoveHandleImpl, :virEventAddTimerImpl, :virEventUpdateTimerImpl, :virEventRemoveTimerImpl)
+expect_success(Libvirt, "unregister all callbacks", "event_register_impl", nil, nil, nil, nil, nil, nil)
+expect_success(Libvirt, "all Proc callbacks", "event_register_impl", virEventAddHandleProc, virEventUpdateHandleProc, virEventRemoveHandleProc, virEventAddTimerProc, virEventUpdateTimerProc, virEventRemoveTimerProc)
+expect_success(Libvirt, "unregister all callbacks", "event_register_impl")
+
 finish_tests

data/tests/test_secret.rb

@@ -7,75 +7,19 @@ $: << File.dirname(__FILE__)
 require 'libvirt'
 require 'test_utils.rb'
 
-UUID = "bd339530-134c-6d07-4410-17fb90dad805"
-
 conn = Libvirt::open("qemu:///system")
 
-new_secret_xml = <<EOF
-<secret ephemeral='no' private='no'>
-  <description>test secret</description>
-  <uuid>#{UUID}</uuid>
-  <usage type='volume'>
-    <volume>/var/lib/libvirt/images/mail.img</volume>
-  </usage>
-</secret>
-EOF
-
-# TESTGROUP: conn.num_of_secrets
-expect_too_many_args(conn, "num_of_secrets", 1)
-expect_success(conn, "no args", "num_of_secrets")
-
-# TESTGROUP: conn.list_secrets
-expect_too_many_args(conn, "list_secrets", 1)
-expect_success(conn, "no args", "list_secrets")
-
-# TESTGROUP: conn.lookup_secret_by_uuid
-newsecret = conn.define_secret_xml(new_secret_xml)
-
-expect_too_many_args(conn, "lookup_secret_by_uuid", 1, 2)
-expect_too_few_args(conn, "lookup_secret_by_uuid")
-expect_invalid_arg_type(conn, "lookup_secret_by_uuid", 1)
-
-expect_success(conn, "uuid arg", "lookup_secret_by_uuid", UUID) {|x| x.uuid == UUID}
-
-newsecret.undefine
-
-# TESTGROUP: conn.lookup_secret_by_usage
-newsecret = conn.define_secret_xml(new_secret_xml)
-
-expect_too_many_args(conn, "lookup_secret_by_usage", 1, 2, 3)
-expect_too_few_args(conn, "lookup_secret_by_usage")
-expect_invalid_arg_type(conn, "lookup_secret_by_usage", 'foo', 1)
-expect_invalid_arg_type(conn, "lookup_secret_by_usage", 1, 2)
-expect_fail(conn, Libvirt::RetrieveError, "invalid secret", "lookup_secret_by_usage", Libvirt::Secret::USAGE_TYPE_VOLUME, "foo")
-
-expect_success(conn, "usage type and key", "lookup_secret_by_usage", Libvirt::Secret::USAGE_TYPE_VOLUME, "/var/lib/libvirt/images/mail.img")
-
-newsecret.undefine
-
-# TESTGROUP: conn.define_secret_xml
-expect_too_many_args(conn, "define_secret_xml", 1, 2, 3)
-expect_too_few_args(conn, "define_secret_xml")
-expect_invalid_arg_type(conn, "define_secret_xml", 1)
-expect_invalid_arg_type(conn, "define_secret_xml", nil)
-expect_invalid_arg_type(conn, "define_secret_xml", "hello", 'foo')
-expect_fail(conn, Libvirt::DefinitionError, "invalid XML", "define_secret_xml", "hello")
-
-expect_success(conn, "secret XML", "define_secret_xml", new_secret_xml)
-
-newsecret.undefine
-
 # TESTGROUP: secret.uuid
-newsecret = conn.define_secret_xml(new_secret_xml)
+newsecret = conn.define_secret_xml($new_secret_xml)
 
 expect_too_many_args(newsecret, "uuid", 1)
 
-expect_success(newsecret, "no args", "uuid") {|x| x == UUID}
+expect_success(newsecret, "no args", "uuid") {|x| x == $SECRET_UUID}
 
 newsecret.undefine
 
 # TESTGROUP: secret.usagetype
-newsecret = conn.define_secret_xml(new_secret_xml)
+newsecret = conn.define_secret_xml($new_secret_xml)
 
 expect_too_many_args(newsecret, "usagetype", 1)
 
@@ -84,7 +28,7 @@ expect_success(newsecret, "no args", "usagetype") {|x| x == Libvirt::Secret::USA
 newsecret.undefine
 
 # TESTGROUP: secret.usageid
-newsecret = conn.define_secret_xml(new_secret_xml)
+newsecret = conn.define_secret_xml($new_secret_xml)
 
 expect_too_many_args(newsecret, "usageid", 1)
 
@@ -93,7 +37,7 @@ expect_success(newsecret, "no args", "usageid")
 newsecret.undefine
 
 # TESTGROUP: secret.xml_desc
-newsecret = conn.define_secret_xml(new_secret_xml)
+newsecret = conn.define_secret_xml($new_secret_xml)
 
 expect_too_many_args(newsecret, "xml_desc", 1, 2)
 expect_invalid_arg_type(newsecret, "xml_desc", "foo")
@@ -103,7 +47,7 @@ expect_success(newsecret, "no args", "xml_desc")
 newsecret.undefine
 
 # TESTGROUP: secret.set_value
-newsecret = conn.define_secret_xml(new_secret_xml)
+newsecret = conn.define_secret_xml($new_secret_xml)
 
 expect_too_many_args(newsecret, "set_value", 1, 2, 3)
 expect_too_few_args(newsecret, "set_value")
@@ -115,7 +59,7 @@ expect_success(newsecret, "value arg", "set_value", "foo")
 newsecret.undefine
 
 # TESTGROUP: secret.get_value
-newsecret = conn.define_secret_xml(new_secret_xml)
+newsecret = conn.define_secret_xml($new_secret_xml)
 newsecret.set_value("foo")
 
 expect_too_many_args(newsecret, "get_value", 1, 2)
@@ -126,14 +70,14 @@ expect_success(newsecret, "no args", "get_value") {|x| x == 'foo'}
 newsecret.undefine
 
 # TESTGROUP: secret.undefine
-newsecret = conn.define_secret_xml(new_secret_xml)
+newsecret = conn.define_secret_xml($new_secret_xml)
 
 expect_too_many_args(newsecret, "undefine", 1)
 
 expect_success(newsecret, "no args", "undefine")
 
 # TESTGROUP: secret.free
-newsecret = conn.define_secret_xml(new_secret_xml)
+newsecret = conn.define_secret_xml($new_secret_xml)
 newsecret.undefine
 
 expect_too_many_args(newsecret, "free", 1)

data/tests/test_storage.rb

@@ -7,8 +7,6 @@ $: << File.dirname(__FILE__)
 require 'libvirt'
 require 'test_utils.rb'
 
-UUID = "33a5c045-645a-2c00-e56b-927cdf34e17a"
-
 conn = Libvirt::open("qemu:///system")
 
 begin
@@ -20,17 +18,7 @@ rescue
 end
 
 # test setup
-`rm -rf /tmp/ruby-libvirt-tester; mkdir /tmp/ruby-libvirt-tester`
-
-new_storage_pool_xml = <<EOF
-<pool type="dir">
-  <name>ruby-libvirt-tester</name>
-  <uuid>#{UUID}</uuid>
-  <target>
-    <path>/tmp/ruby-libvirt-tester</path>
-  </target>
-</pool>
-EOF
+`rm -rf #{$POOL_PATH}; mkdir #{$POOL_PATH} ; echo $?`
 
 new_storage_vol_xml = <<EOF
 <volume>
@@ -54,58 +42,8 @@ new_storage_vol_xml_2 = <<EOF
 </volume>
 EOF
 
-# TESTGROUP: conn.list_storage_pools
-expect_too_many_args(conn, "list_storage_pools", 1)
-expect_success(conn, "no args", "list_storage_pools")
-
-# TESTGROUP: conn.num_of_storage_pools
-expect_too_many_args(conn, "num_of_storage_pools", 1)
-expect_success(conn, "no args", "num_of_storage_pools")
-
-# TESTGROUP: conn.list_defined_storage_pools
-expect_too_many_args(conn, "list_defined_storage_pools", 1)
-expect_success(conn, "no args", "list_defined_storage_pools")
-
-# TESTGROUP: conn.num_of_defined_storage_pools
-expect_too_many_args(conn, "num_of_defined_storage_pools", 1)
-expect_success(conn, "no args", "num_of_defined_storage_pools")
-
-# TESTGROUP: conn.lookup_storage_pool_by_name
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
-
-expect_too_many_args(conn, "lookup_storage_pool_by_name", 1, 2)
-expect_too_few_args(conn, "lookup_storage_pool_by_name")
-expect_invalid_arg_type(conn, "lookup_storage_pool_by_name", 1)
-expect_fail(conn, Libvirt::RetrieveError, "non-existent name arg", "lookup_storage_pool_by_name", "foobarbazsucker")
-
-expect_success(conn, "name arg", "lookup_storage_pool_by_name", "ruby-libvirt-tester")
-
-newpool.destroy
-
-newpool = conn.define_storage_pool_xml(new_storage_pool_xml)
-expect_success(conn, "name arg", "lookup_storage_pool_by_name", "ruby-libvirt-tester")
-newpool.undefine
-
-# TESTGROUP: conn.lookup_storage_pool_by_uuid
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
-
-expect_too_many_args(conn, "lookup_storage_pool_by_uuid", 1, 2)
-expect_too_few_args(conn, "lookup_storage_pool_by_uuid")
-expect_invalid_arg_type(conn, "lookup_storage_pool_by_uuid", 1)
-expect_fail(conn, Libvirt::RetrieveError, "non-existent uuid arg", "lookup_storage_pool_by_uuid", "foobarbazsucker")
-
-expect_success(conn, "uuid arg", "lookup_storage_pool_by_uuid", UUID)
-
-newpool.destroy
-
-newpool = conn.define_storage_pool_xml(new_storage_pool_xml)
-
-expect_success(conn, "uuid arg", "lookup_storage_pool_by_uuid", UUID)
-
-newpool.undefine
-
 # TESTGROUP: vol.pool
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 
 newvol = newpool.create_volume_xml(new_storage_vol_xml)
 
@@ -117,45 +55,8 @@ newvol.delete
 
 newpool.destroy
 
-# TESTGROUP: conn.create_storage_pool_xml
-expect_too_many_args(conn, "create_storage_pool_xml", new_storage_pool_xml, 0, 1)
-expect_too_few_args(conn, "create_storage_pool_xml")
-expect_invalid_arg_type(conn, "create_storage_pool_xml", nil)
-expect_invalid_arg_type(conn, "create_storage_pool_xml", 1)
-expect_invalid_arg_type(conn, "create_storage_pool_xml", new_storage_pool_xml, "foo")
-expect_fail(conn, Libvirt::Error, "invalid xml", "create_storage_pool_xml", "hello")
-
-expect_success(conn, "storage pool XML", "create_storage_pool_xml", new_storage_pool_xml)
-
-expect_fail(conn, Libvirt::Error, "already existing domain", "create_storage_pool_xml", new_storage_pool_xml)
-
-newpool.destroy
-
-# TESTGROUP: conn.define_storage_pool_xml
-expect_too_many_args(conn, "define_storage_pool_xml", new_storage_pool_xml, 0, 1)
-expect_too_few_args(conn, "define_storage_pool_xml")
-expect_invalid_arg_type(conn, "define_storage_pool_xml", nil)
-expect_invalid_arg_type(conn, "define_storage_pool_xml", 1)
-expect_invalid_arg_type(conn, "define_storage_pool_xml", new_storage_pool_xml, "foo")
-expect_fail(conn, Libvirt::Error, "invalid xml", "define_storage_pool_xml", "hello")
-
-expect_success(conn, "storage pool XML", "define_storage_pool_xml", new_storage_pool_xml)
-
-newpool.undefine
-
-# TESTGROUP: conn.discover_storage_pool_sources
-expect_too_many_args(conn, "discover_storage_pool_sources", 1, 2, 3, 4)
-expect_too_few_args(conn, "discover_storage_pool_sources")
-expect_invalid_arg_type(conn, "discover_storage_pool_sources", 1)
-expect_invalid_arg_type(conn, "discover_storage_pool_sources", "foo", 1)
-expect_invalid_arg_type(conn, "discover_storage_pool_sources", "foo", "bar", "baz")
-
-expect_fail(conn, Libvirt::Error, "invalid pool type", "discover_storage_pool_sources", "foo")
-
-expect_success(conn, "pool type", "discover_storage_pool_sources", "logical")
-
 # TESTGROUP: pool.build
-newpool = conn.define_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.define_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "build", 1, 2)
 expect_invalid_arg_type(newpool, "build", 'foo')
@@ -165,14 +66,14 @@ expect_success(newpool, "no args", "build")
 newpool.undefine
 
 # TESTGROUP: pool.undefine
-newpool = conn.define_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.define_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "undefine", 1)
 
 expect_success(newpool, "no args", "undefine")
 
 # TESTGROUP: pool.create
-newpool = conn.define_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.define_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "create", 1, 2)
 expect_invalid_arg_type(newpool, "create", 'foo')
@@ -183,14 +84,14 @@ newpool.destroy
 newpool.undefine
 
 # TESTGROUP: pool.destroy
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "destroy", 1)
 
 expect_success(newpool, "no args", "destroy")
 
 # TESTGROUP: pool.delete
-newpool = conn.define_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.define_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "delete", 1, 2)
 expect_invalid_arg_type(newpool, "delete", 'foo')
@@ -202,7 +103,7 @@ expect_success(newpool, "no args", "delete")
 newpool.undefine
 
 # TESTGROUP: pool.refresh
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "refresh", 1, 2)
 expect_invalid_arg_type(newpool, "refresh", 'foo')
@@ -212,7 +113,7 @@ expect_success(newpool, "no args", "refresh")
 newpool.destroy
 
 # TESTGROUP: pool.name
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "name", 1)
 
@@ -221,16 +122,16 @@ expect_success(newpool, "no args", "name") {|x| x == "ruby-libvirt-tester"}
 newpool.destroy
 
 # TESTGROUP: pool.uuid
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "uuid", 1)
 
-expect_success(newpool, "no args", "uuid") {|x| x == UUID}
+expect_success(newpool, "no args", "uuid") {|x| x == $POOL_UUID}
 
 newpool.destroy
 
 # TESTGROUP: pool.info
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "info", 1)
 
@@ -239,7 +140,7 @@ expect_success(newpool, "no args", "info")
 newpool.destroy
 
 # TESTGROUP: pool.xml_desc
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "xml_desc", 1, 2)
 expect_invalid_arg_type(newpool, "xml_desc", "foo")
@@ -249,7 +150,7 @@ expect_success(newpool, "no args", "xml_desc")
 newpool.destroy
 
 # TESTGROUP: pool.autostart?
-newpool = conn.define_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.define_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "autostart?", 1)
 
@@ -262,7 +163,7 @@ expect_success(newpool, "no args", "autostart?") {|x| x == true}
 newpool.undefine
 
 # TESTGROUP: pool.autostart=
-newpool = conn.define_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.define_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "autostart=", 1, 2)
 expect_invalid_arg_type(newpool, "autostart=", 'foo')
@@ -286,7 +187,7 @@ end
 newpool.undefine
 
 # TESTGROUP: pool.num_of_volumes
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "num_of_volumes", 1)
 
@@ -295,7 +196,7 @@ expect_success(newpool, "no args", "num_of_volumes") {|x| x == 0}
 newpool.destroy
 
 # TESTGROUP: pool.list_volumes
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "list_volumes", 1)
 
@@ -304,14 +205,14 @@ expect_success(newpool, "no args", "list_volumes")
 newpool.destroy
 
 # TESTGROUP: pool.free
-newpool = conn.define_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.define_storage_pool_xml($new_storage_pool_xml)
 newpool.undefine
 expect_too_many_args(newpool, "free", 1)
 
 expect_success(newpool, "no args", "free")
 
 # TESTGROUP: pool.lookup_volume_by_name
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 newvol = newpool.create_volume_xml(new_storage_vol_xml)
 
 expect_too_many_args(newpool, "lookup_volume_by_name", 1, 2)
@@ -326,7 +227,7 @@ newvol.delete
 newpool.destroy
 
 # TESTGROUP: pool.lookup_volume_by_key
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 newvol = newpool.create_volume_xml(new_storage_vol_xml)
 
 expect_too_many_args(newpool, "lookup_volume_by_key", 1, 2)
@@ -341,7 +242,7 @@ newvol.delete
 newpool.destroy
 
 # TESTGROUP: pool.lookup_volume_by_path
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 newvol = newpool.create_volume_xml(new_storage_vol_xml)
 
 expect_too_many_args(newpool, "lookup_volume_by_path", 1, 2)
@@ -356,7 +257,7 @@ newvol.delete
 newpool.destroy
 
 # TESTGROUP: vol.name
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 newvol = newpool.create_volume_xml(new_storage_vol_xml)
 
 expect_too_many_args(newvol, "name", 1)
@@ -367,7 +268,7 @@ newvol.delete
 newpool.destroy
 
 # TESTGROUP: vol.key
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 newvol = newpool.create_volume_xml(new_storage_vol_xml)
 
 expect_too_many_args(newvol, "key", 1)
@@ -378,7 +279,7 @@ newvol.delete
 newpool.destroy
 
 # TESTGROUP: pool.create_volume_xml
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "create_volume_xml", new_storage_vol_xml, 0, 1)
 expect_too_few_args(newpool, "create_volume_xml")
@@ -395,7 +296,7 @@ newvol.delete
 newpool.destroy
 
 # TESTGROUP: pool.create_volume_xml_from
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 newvol = newpool.create_volume_xml(new_storage_vol_xml)
 
 expect_too_many_args(newpool, "create_volume_xml_from", new_storage_vol_xml_2, 0, 1, 2)
@@ -414,7 +315,7 @@ newvol.delete
 newpool.destroy
 
 # TESTGROUP: pool.active?
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 
 expect_too_many_args(newpool, "active?", 1)
 
@@ -422,7 +323,7 @@ expect_success(newpool, "no args", "active?") {|x| x == true}
 
 newpool.destroy
 
-newpool = conn.define_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.define_storage_pool_xml($new_storage_pool_xml)
 
 expect_success(newpool, "no args", "active?") {|x| x == false}
 
@@ -434,7 +335,7 @@ newpool.destroy
 newpool.undefine
 
 # TESTGROUP: pool.persistent?
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 sleep 1
 
 expect_too_many_args(newpool, "persistent?", 1)
@@ -443,14 +344,14 @@ expect_success(newpool, "no args", "persistent?") {|x| x == false}
 
 newpool.destroy
 
-newpool = conn.define_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.define_storage_pool_xml($new_storage_pool_xml)
 
 expect_success(newpool, "no args", "persistent?") {|x| x == true}
 
 newpool.undefine
 
 # TESTGROUP: vol.delete
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 newvol = newpool.create_volume_xml(new_storage_vol_xml)
 
 expect_too_many_args(newvol, "delete", 1, 2)
@@ -461,7 +362,7 @@ expect_success(newvol, "no args", "delete")
 newpool.destroy
 
 # TESTGROUP: vol.wipe
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 newvol = newpool.create_volume_xml(new_storage_vol_xml)
 
 expect_too_many_args(newvol, "wipe", 1, 2)
@@ -473,7 +374,7 @@ newvol.delete
 newpool.destroy
 
 # TESTGROUP: vol.info
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 newvol = newpool.create_volume_xml(new_storage_vol_xml)
 
 expect_too_many_args(newvol, "info", 1)
@@ -484,7 +385,7 @@ newvol.delete
 newpool.destroy
 
 # TESTGROUP: vol.xml_desc
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 newvol = newpool.create_volume_xml(new_storage_vol_xml)
 
 expect_too_many_args(newvol, "xml_desc", 1, 2)
@@ -496,7 +397,7 @@ newvol.delete
 newpool.destroy
 
 # TESTGROUP: vol.path
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 newvol = newpool.create_volume_xml(new_storage_vol_xml)
 
 expect_too_many_args(newvol, "path", 1)
@@ -507,7 +408,7 @@ newvol.delete
 newpool.destroy
 
 # TESTGROUP: vol.free
-newpool = conn.create_storage_pool_xml(new_storage_pool_xml)
+newpool = conn.create_storage_pool_xml($new_storage_pool_xml)
 newvol = newpool.create_volume_xml(new_storage_vol_xml)
 newvol.delete