ruby-libvirt 0.3.0 → 0.4.0

data/tests/test_interface.rb

@@ -17,90 +17,24 @@ def find_valid_iface(conn)
   end
 end
 
-
 conn = Libvirt::open("qemu:///system")
 
+# test setup
 begin
   `rm -f /etc/sysconfig/network-scripts/ifcfg-ruby-libvirt-tester`
   `brctl delbr ruby-libvirt-tester >& /dev/null`
 rescue
 end
 
-new_interface_xml = <<EOF
-<interface type="bridge" name="ruby-libvirt-tester">
-  <start mode="onboot"/>
-  <bridge delay="0">
-  </bridge>
-</interface>
-EOF
-
-# TESTGROUP: conn.num_of_interfaces
-expect_too_many_args(conn, "num_of_interfaces", 1)
-expect_success(conn, "no args", "num_of_interfaces")
-
-# TESTGROUP: conn.list_interfaces
-expect_too_many_args(conn, "list_interfaces", 1)
-expect_success(conn, "no args", "list_interfaces")
-
-# TESTGROUP: conn.num_of_defined_interfaces
-expect_too_many_args(conn, "num_of_defined_interfaces", 1)
-expect_success(conn, "no args", "num_of_defined_interfaces")
-
-# TESTGROUP: conn.list_defined_interfaces
-expect_too_many_args(conn, "list_defined_interfaces", 1)
-expect_success(conn, "no args", "list_defined_interfaces")
-
-# TESTGROUP: conn.lookup_interface_by_name
-newiface = conn.define_interface_xml(new_interface_xml)
-
-expect_too_many_args(conn, "lookup_interface_by_name", 1, 2)
-expect_too_few_args(conn, "lookup_interface_by_name")
-expect_invalid_arg_type(conn, "lookup_interface_by_name", 1)
-expect_fail(conn, Libvirt::RetrieveError, "non-existent name arg", "lookup_interface_by_name", "foobarbazsucker")
-
-expect_success(conn, "name arg", "lookup_interface_by_name", "ruby-libvirt-tester")
-
-newiface.destroy
-
-expect_success(conn, "name arg", "lookup_interface_by_name", "ruby-libvirt-tester")
-
-newiface.undefine
-
-# TESTGROUP: conn.lookup_interface_by_mac
-newiface = conn.define_interface_xml(new_interface_xml)
-
-expect_too_many_args(conn, "lookup_interface_by_mac", 1, 2)
-expect_too_few_args(conn, "lookup_interface_by_mac")
-expect_invalid_arg_type(conn, "lookup_interface_by_mac", 1)
-expect_fail(conn, Libvirt::RetrieveError, "non-existent mac arg", "lookup_interface_by_mac", "foobarbazsucker")
-
-testiface = find_valid_iface(conn)
-if not testiface.nil?
-  expect_success(conn, "name arg", "lookup_interface_by_mac", testiface.mac) {|x| x.mac == testiface.mac}
-end
-
-newiface.undefine
-
-# TESTGROUP: conn.define_interface_xml
-expect_too_many_args(conn, "define_interface_xml", 1, 2, 3)
-expect_too_few_args(conn, "define_interface_xml")
-expect_invalid_arg_type(conn, "define_interface_xml", 1)
-expect_invalid_arg_type(conn, "define_interface_xml", nil)
-expect_invalid_arg_type(conn, "define_interface_xml", "hello", 'foo')
-expect_fail(conn, Libvirt::DefinitionError, "invalid XML", "define_interface_xml", "hello")
-
-expect_success(conn, "interface XML", "define_interface_xml", new_interface_xml)
-newiface.undefine
-
 # TESTGROUP: iface.undefine
-newiface = conn.define_interface_xml(new_interface_xml)
+newiface = conn.define_interface_xml($new_interface_xml)
 
 expect_too_many_args(newiface, "undefine", 1)
 
 expect_success(newiface, "no args", "undefine")
 
 # TESTGROUP: iface.create
-newiface = conn.define_interface_xml(new_interface_xml)
+newiface = conn.define_interface_xml($new_interface_xml)
 
 expect_too_many_args(newiface, "create", 1, 2)
 expect_invalid_arg_type(newiface, "create", 'foo')
@@ -113,7 +47,7 @@ expect_invalid_arg_type(newiface, "create", 'foo')
 newiface.undefine
 
 # TESTGROUP: iface.destroy
-newiface = conn.define_interface_xml(new_interface_xml)
+newiface = conn.define_interface_xml($new_interface_xml)
 
 expect_too_many_args(newiface, "destroy", 1, 2)
 expect_invalid_arg_type(newiface, "destroy", 'foo')
@@ -123,7 +57,7 @@ expect_success(newiface, "no args", "destroy")
 newiface.undefine
 
 # TESTGROUP: iface.active?
-newiface = conn.define_interface_xml(new_interface_xml)
+newiface = conn.define_interface_xml($new_interface_xml)
 
 expect_too_many_args(newiface, "active?", 1)
 
@@ -136,7 +70,7 @@ expect_success(newiface, "no args", "active?") {|x| x == false}
 newiface.undefine
 
 # TESTGROUP: iface.name
-newiface = conn.define_interface_xml(new_interface_xml)
+newiface = conn.define_interface_xml($new_interface_xml)
 
 expect_too_many_args(newiface, "name", 1)
 
@@ -161,7 +95,7 @@ if not testiface.nil?
 end
 
 # TESTGROUP: iface.free
-newiface = conn.define_interface_xml(new_interface_xml)
+newiface = conn.define_interface_xml($new_interface_xml)
 newiface.undefine
 expect_too_many_args(newiface, "free", 1)
 

data/tests/test_network.rb

@@ -7,8 +7,6 @@ $: << File.dirname(__FILE__)
 require 'libvirt'
 require 'test_utils.rb'
 
-UUID = "04068860-d9a2-47c5-bc9d-9e047ae901da"
-
 conn = Libvirt::open("qemu:///system")
 
 # initial cleanup for previous run
@@ -20,98 +18,15 @@ rescue
   # in case we didn't find it, don't do anything
 end
 
-new_net_xml = <<EOF
-<network>
-  <name>ruby-libvirt-tester</name>
-  <uuid>#{UUID}</uuid>
-  <forward mode='nat'/>
-  <bridge name='rubybr0' stp='on' delay='0' />
-  <ip address='192.168.134.1' netmask='255.255.255.0'>
-    <dhcp>
-      <range start='192.168.134.2' end='192.168.134.254' />
-    </dhcp>
-  </ip>
-</network>
-EOF
-
-# TESTGROUP: conn.num_of_networks
-expect_too_many_args(conn, "num_of_networks", 1)
-expect_success(conn, "no args", "num_of_networks")
-
-# TESTGROUP: conn.list_networks
-expect_too_many_args(conn, "list_networks", 1)
-expect_success(conn, "no args", "list_networks")
-
-# TESTGROUP: conn.num_of_defined_networks
-expect_too_many_args(conn, "num_of_defined_networks", 1)
-expect_success(conn, "no args", "num_of_defined_networks")
-
-# TESTGROUP: conn.list_defined_networks
-expect_too_many_args(conn, "list_defined_networks", 1)
-expect_success(conn, "no args", "list_defined_networks")
-
-# TESTGROUP: conn.lookup_network_by_name
-newnet = conn.create_network_xml(new_net_xml)
-
-expect_too_many_args(conn, "lookup_network_by_name", 1, 2)
-expect_too_few_args(conn, "lookup_network_by_name")
-expect_invalid_arg_type(conn, "lookup_network_by_name", 1)
-expect_fail(conn, Libvirt::RetrieveError, "non-existent name arg", "lookup_network_by_name", "foobarbazsucker")
-
-expect_success(conn, "name arg", "lookup_network_by_name", "ruby-libvirt-tester")
-newnet.destroy
-
-newnet = conn.define_network_xml(new_net_xml)
-expect_success(conn, "name arg", "lookup_network_by_name", "ruby-libvirt-tester")
-newnet.undefine
-
-# TESTGROUP: conn.lookup_network_by_uuid
-newnet = conn.create_network_xml(new_net_xml)
-
-expect_too_many_args(conn, "lookup_network_by_uuid", 1, 2)
-expect_too_few_args(conn, "lookup_network_by_uuid")
-expect_invalid_arg_type(conn, "lookup_network_by_uuid", 1)
-expect_fail(conn, Libvirt::RetrieveError, "non-existent uuid arg", "lookup_network_by_uuid", "foobarbazsucker")
-
-expect_success(conn, "uuid arg", "lookup_network_by_uuid", UUID)
-newnet.destroy
-
-newnet = conn.define_network_xml(new_net_xml)
-expect_success(conn, "uuid arg", "lookup_network_by_uuid", UUID)
-newnet.undefine
-
-# TESTGROUP: conn.create_network_xml
-expect_too_many_args(conn, "create_network_xml", new_net_xml, 0)
-expect_too_few_args(conn, "create_network_xml")
-expect_invalid_arg_type(conn, "create_network_xml", nil)
-expect_invalid_arg_type(conn, "create_network_xml", 1)
-expect_fail(conn, Libvirt::Error, "invalid xml", "create_network_xml", "hello")
-
-newnet = expect_success(conn, "network XML", "create_network_xml", new_net_xml)
-
-expect_fail(conn, Libvirt::Error, "already existing network", "create_network_xml", new_net_xml)
-
-newnet.destroy
-
-# TESTGROUP: conn.define_network_xml
-expect_too_many_args(conn, "define_network_xml", 1, 2)
-expect_too_few_args(conn, "define_network_xml")
-expect_invalid_arg_type(conn, "define_network_xml", 1)
-expect_invalid_arg_type(conn, "define_network_xml", nil)
-expect_fail(conn, Libvirt::DefinitionError, "invalid XML", "define_network_xml", "hello")
-
-newnet = expect_success(conn, "network XML", "define_network_xml", new_net_xml)
-newnet.undefine
-
 # TESTGROUP: net.undefine
-newnet = conn.define_network_xml(new_net_xml)
+newnet = conn.define_network_xml($new_net_xml)
 
 expect_too_many_args(newnet, "undefine", 1)
 
 expect_success(newnet, "no args", "undefine")
 
 # TESTGROUP: net.create
-newnet = conn.define_network_xml(new_net_xml)
+newnet = conn.define_network_xml($new_net_xml)
 
 expect_too_many_args(newnet, "create", 1)
 
@@ -123,14 +38,14 @@ newnet.destroy
 newnet.undefine
 
 # TESTGROUP: net.destroy
-newnet = conn.create_network_xml(new_net_xml)
+newnet = conn.create_network_xml($new_net_xml)
 
 expect_too_many_args(newnet, "destroy", 1)
 
 expect_success(newnet, "no args", "destroy")
 
 # TESTGROUP: net.name
-newnet = conn.create_network_xml(new_net_xml)
+newnet = conn.create_network_xml($new_net_xml)
 
 expect_too_many_args(newnet, "name", 1)
 
@@ -139,16 +54,16 @@ expect_success(newnet, "no args", "name") {|x| x == "ruby-libvirt-tester"}
 newnet.destroy
 
 # TESTGROUP: net.uuid
-newnet = conn.create_network_xml(new_net_xml)
+newnet = conn.create_network_xml($new_net_xml)
 
 expect_too_many_args(newnet, "uuid", 1)
 
-expect_success(newnet, "no args", "uuid") {|x| x == UUID}
+expect_success(newnet, "no args", "uuid") {|x| x == $NETWORK_UUID}
 
 newnet.destroy
 
 # TESTGROUP: net.xml_desc
-newnet = conn.create_network_xml(new_net_xml)
+newnet = conn.create_network_xml($new_net_xml)
 
 expect_too_many_args(newnet, "xml_desc", 1, 2)
 expect_invalid_arg_type(newnet, "xml_desc", "foo")
@@ -158,7 +73,7 @@ expect_success(newnet, "no args", "xml_desc")
 newnet.destroy
 
 # TESTGROUP: net.bridge_name
-newnet = conn.create_network_xml(new_net_xml)
+newnet = conn.create_network_xml($new_net_xml)
 
 expect_too_many_args(newnet, "bridge_name", 1)
 
@@ -167,7 +82,7 @@ expect_success(newnet, "no args", "bridge_name") {|x| x == "rubybr0"}
 newnet.destroy
 
 # TESTGROUP: net.autostart?
-newnet = conn.define_network_xml(new_net_xml)
+newnet = conn.define_network_xml($new_net_xml)
 
 expect_too_many_args(newnet, "autostart?", 1)
 
@@ -180,7 +95,7 @@ expect_success(newnet, "no args", "autostart?") {|x| x == true}
 newnet.undefine
 
 # TESTGROUP: net.autostart=
-newnet = conn.define_network_xml(new_net_xml)
+newnet = conn.define_network_xml($new_net_xml)
 
 expect_too_many_args(newnet, "autostart=", 1, 2)
 expect_invalid_arg_type(newnet, "autostart=", 'foo')
@@ -204,14 +119,14 @@ end
 newnet.undefine
 
 # TESTGROUP: net.free
-newnet = conn.define_network_xml(new_net_xml)
+newnet = conn.define_network_xml($new_net_xml)
 newnet.undefine
 expect_too_many_args(newnet, "free", 1)
 
 expect_success(newnet, "no args", "free")
 
 # TESTGROUP: net.active?
-newnet = conn.create_network_xml(new_net_xml)
+newnet = conn.create_network_xml($new_net_xml)
 
 expect_too_many_args(newnet, "active?", 1)
 
@@ -219,7 +134,7 @@ expect_success(newnet, "no args", "active?") {|x| x == true}
 
 newnet.destroy
 
-newnet = conn.define_network_xml(new_net_xml)
+newnet = conn.define_network_xml($new_net_xml)
 
 expect_success(newnet, "no args", "active?") {|x| x == false}
 
@@ -231,7 +146,7 @@ newnet.destroy
 newnet.undefine
 
 # TESTGROUP: net.persistent?
-newnet = conn.create_network_xml(new_net_xml)
+newnet = conn.create_network_xml($new_net_xml)
 
 expect_too_many_args(newnet, "persistent?", 1)
 
@@ -239,7 +154,7 @@ expect_success(newnet, "no args", "persistent?") {|x| x == false}
 
 newnet.destroy
 
-newnet = conn.define_network_xml(new_net_xml)
+newnet = conn.define_network_xml($new_net_xml)
 
 expect_success(newnet, "no args", "persistent?") {|x| x == true}
 

data/tests/test_nodedevice.rb

@@ -9,37 +9,6 @@ require 'test_utils.rb'
 
 conn = Libvirt::open("qemu:///system")
 
-# TESTGROUP: conn.num_of_nodedevices
-expect_too_many_args(conn, "num_of_nodedevices", 1, 2, 3)
-expect_invalid_arg_type(conn, "num_of_nodedevices", 1)
-expect_invalid_arg_type(conn, "num_of_nodedevices", 'foo', 'bar')
-expect_success(conn, "no args", "num_of_nodedevices")
-
-# TESTGROUP: conn.list_nodedevices
-expect_too_many_args(conn, "list_nodedevices", 1, 2, 3)
-expect_invalid_arg_type(conn, "list_nodedevices", 1)
-expect_invalid_arg_type(conn, "list_nodedevices", 'foo', 'bar')
-expect_success(conn, "no args", "list_nodedevices")
-
-# TESTGROUP: conn.lookup_nodedevice_by_name
-testnode = conn.lookup_nodedevice_by_name(conn.list_nodedevices[0])
-
-expect_too_many_args(conn, "lookup_nodedevice_by_name", 1, 2)
-expect_too_few_args(conn, "lookup_nodedevice_by_name")
-expect_invalid_arg_type(conn, "lookup_nodedevice_by_name", 1)
-expect_fail(conn, Libvirt::RetrieveError, "non-existent name arg", "lookup_nodedevice_by_name", "foobarbazsucker")
-
-expect_success(conn, "name arg", "lookup_nodedevice_by_name", testnode.name)
-
-# TESTGROUP: conn.create_nodedevice_xml
-expect_too_many_args(conn, "create_nodedevice_xml", 1, 2, 3)
-expect_too_few_args(conn, "create_nodedevice_xml")
-expect_invalid_arg_type(conn, "create_nodedevice_xml", 1)
-expect_invalid_arg_type(conn, "create_nodedevice_xml", "foo", 'bar')
-expect_fail(conn, Libvirt::Error, "invalid XML", "create_nodedevice_xml", "hello")
-
-#expect_success(conn, "nodedevice XML", "create_nodedevice_xml", "<nodedevice/>")
-
 # TESTGROUP: nodedevice.name
 testnode = conn.lookup_nodedevice_by_name(conn.list_nodedevices[0])
 

data/tests/test_nwfilter.rb

@@ -7,72 +7,17 @@ $: << File.dirname(__FILE__)
 require 'libvirt'
 require 'test_utils.rb'
 
-UUID = "bd339530-134c-6d07-441a-17fb90dad807"
-
 conn = Libvirt::open("qemu:///system")
 
-new_nwfilter_xml = <<EOF
-<filter name='ruby-libvirt-tester' chain='ipv4'>
-  <uuid>#{UUID}</uuid>
-  <rule action='accept' direction='out' priority='100'>
-    <ip srcipaddr='0.0.0.0' dstipaddr='255.255.255.255' protocol='tcp' srcportstart='63000' dstportstart='62000'/>
-  </rule>
-  <rule action='accept' direction='in' priority='100'>
-    <ip protocol='tcp' srcportstart='63000' dstportstart='62000'/>
-  </rule>
-</filter>
-EOF
-
-# TESTGROUP: conn.num_of_nwfilters
-expect_too_many_args(conn, "num_of_nwfilters", 1)
-expect_success(conn, "no args", "num_of_nwfilters")
-
-# TESTGROUP: conn.list_nwfilters
-expect_too_many_args(conn, "list_nwfilters", 1)
-expect_success(conn, "no args", "list_nwfilters")
-
-# TESTGROUP: conn.lookup_nwfilter_by_name
-newnw = conn.define_nwfilter_xml(new_nwfilter_xml)
-
-expect_too_many_args(conn, "lookup_nwfilter_by_name", 1, 2)
-expect_too_few_args(conn, "lookup_nwfilter_by_name")
-expect_invalid_arg_type(conn, "lookup_nwfilter_by_name", 1)
-
-expect_success(conn, "name arg", "lookup_nwfilter_by_name", "ruby-libvirt-tester")
-
-newnw.undefine
-
-# TESTGROUP: conn.lookup_nwfilter_by_uuid
-newnw = conn.define_nwfilter_xml(new_nwfilter_xml)
-
-expect_too_many_args(conn, "lookup_nwfilter_by_uuid", 1, 2)
-expect_too_few_args(conn, "lookup_nwfilter_by_uuid")
-expect_invalid_arg_type(conn, "lookup_nwfilter_by_uuid", 1)
-
-expect_success(conn, "uuid arg", "lookup_nwfilter_by_uuid", UUID) {|x| x.uuid == UUID}
-
-newnw.undefine
-
-# TESTGROUP: conn.define_nwfilter_xml
-expect_too_many_args(conn, "define_nwfilter_xml", 1, 2)
-expect_too_few_args(conn, "define_nwfilter_xml")
-expect_invalid_arg_type(conn, "define_nwfilter_xml", 1)
-expect_invalid_arg_type(conn, "define_nwfilter_xml", nil)
-expect_fail(conn, Libvirt::DefinitionError, "invalid XML", "define_nwfilter_xml", "hello")
-
-newnw = expect_success(conn, "nwfilter XML", "define_nwfilter_xml", new_nwfilter_xml)
-
-newnw.undefine
-
 # TESTGROUP: nwfilter.undefine
-newnw = conn.define_nwfilter_xml(new_nwfilter_xml)
+newnw = conn.define_nwfilter_xml($new_nwfilter_xml)
 
 expect_too_many_args(newnw, "undefine", 1)
 
 expect_success(newnw, "no args", "undefine")
 
 # TESTGROUP: nwfilter.name
-newnw = conn.define_nwfilter_xml(new_nwfilter_xml)
+newnw = conn.define_nwfilter_xml($new_nwfilter_xml)
 
 expect_too_many_args(newnw, "name", 1)
 
@@ -81,16 +26,16 @@ expect_success(newnw, "no args", "name") {|x| x == "ruby-libvirt-tester"}
 newnw.undefine
 
 # TESTGROUP: nwfilter.uuid
-newnw = conn.define_nwfilter_xml(new_nwfilter_xml)
+newnw = conn.define_nwfilter_xml($new_nwfilter_xml)
 
 expect_too_many_args(newnw, "uuid", 1)
 
-expect_success(newnw, "no args", "uuid") {|x| x == UUID}
+expect_success(newnw, "no args", "uuid") {|x| x == $NWFILTER_UUID}
 
 newnw.undefine
 
 # TESTGROUP: nwfilter.xml_desc
-newnw = conn.define_nwfilter_xml(new_nwfilter_xml)
+newnw = conn.define_nwfilter_xml($new_nwfilter_xml)
 
 expect_too_many_args(newnw, "xml_desc", 1, 2)
 expect_invalid_arg_type(newnw, "xml_desc", "foo")
@@ -100,7 +45,7 @@ expect_success(newnw, "no args", "xml_desc")
 newnw.undefine
 
 # TESTGROUP: nwfilter.free
-newnw = conn.define_nwfilter_xml(new_nwfilter_xml)
+newnw = conn.define_nwfilter_xml($new_nwfilter_xml)
 newnw.undefine
 expect_too_many_args(newnw, "free", 1)