ruby-libvirt 0.2.0 → 0.3.0

data/tests/test_utils.rb

@@ -0,0 +1,73 @@
+$FAIL = 0
+$SUCCESS = 0
+$SKIPPED = 0
+
+def expect_success(object, msg, func, *args)
+  begin
+    x = object.send(func, *args)
+    if block_given?
+      res = yield x
+      if not res
+        # FIXME: generate a proper error here
+        raise "Failed"
+      end
+    end
+    puts "OK: #{func} #{msg} succeeded"
+    $SUCCESS = $SUCCESS + 1
+    x
+  rescue NoMethodError
+    puts "SKIPPED: #{func} does not exist"
+    $SKIPPED = $SKIPPED + 1
+  rescue => e
+    puts "FAIL: #{func} #{msg} expected to succeed, threw #{e.class.to_s}: #{e.to_s}"
+    $FAIL = $FAIL + 1
+  end
+end
+
+def expect_fail(object, errtype, errmsg, func, *args)
+  begin
+    object.send(func, *args)
+  rescue NoMethodError
+    puts "SKIPPED: #{func} does not exist"
+  rescue errtype => e
+    puts "OK: #{func} #{errmsg} threw #{errtype.to_s}"
+    $SUCCESS = $SUCCESS + 1
+  rescue => e
+    puts "FAIL: #{func} #{errmsg} expected to throw #{errtype.to_s}, but instead threw #{e.class.to_s}: #{e.to_s}"
+    $FAIL = $FAIL + 1
+  else
+    puts "FAIL: #{func} #{errmsg} expected to throw #{errtype.to_s}, but threw nothing"
+    $FAIL = $FAIL + 1
+  end
+end
+
+def expect_too_many_args(object, func, *args)
+  expect_fail(object, ArgumentError, "too many args", func, *args)
+end
+
+def expect_too_few_args(object, func, *args)
+  expect_fail(object, ArgumentError, "too few args", func, *args)
+end
+
+def expect_invalid_arg_type(object, func, *args)
+  expect_fail(object, TypeError, "invalid arg type", func, *args)
+end
+
+def puts_ok(str)
+  puts "OK: " + str
+  $SUCCESS = $SUCCESS + 1
+end
+
+def puts_fail(str)
+  puts "FAIL: " + str
+  $FAIL = $FAIL + 1
+end
+
+def puts_skipped(str)
+  puts "SKIPPED: " + str
+  $SKIPPED = $SKIPPED + 1
+end
+
+def finish_tests
+  puts "Successfully finished #{$SUCCESS} tests, failed #{$FAIL} tests, skipped #{$SKIPPED} tests"
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-libvirt
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - David Lutterkort, Chris Lalancette
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-05 00:00:00 -04:00
+date: 2010-12-12 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -57,9 +57,8 @@ files:
 - ext/libvirt/interface.h
 - ext/libvirt/extconf.rb
 - tests/test_interface.rb
-- tests/tc_connect.rb
+- tests/test_utils.rb
 - tests/test_network.rb
-- tests/node.xml
 - tests/test_domain.rb
 - tests/test_open.rb
 - tests/test_secret.rb

data/tests/node.xml

@@ -1,110 +0,0 @@
-<?xml version="1.0"?>
-<node>
-  <!-- This file gives an example config for the mock 'test' backend
-     driver to libvirt. This is intended to allow relible unit testing
-     of applications using libvirt. To use this with virsh, run something
-     like:
-
-      virsh -connect test:////path/to/this/dir/testnode.xml nodeinfo
-
-     -->
-  <domain type="test">
-    <name>fv0</name>
-    <uuid>4dea22b31d52d8f32516782e98ab3fa0</uuid>
-    <os>
-      <type>hvm</type>
-      <loader>/usr/lib/xen/boot/hvmloader</loader>
-      <boot dev="hd"/>
-    </os>
-    <currentMemory>2097152</currentMemory>
-    <memory>8388608</memory>
-    <vcpu>2</vcpu>
-    <on_poweroff>destroy</on_poweroff>
-    <on_reboot>restart</on_reboot>
-    <on_crash>restart</on_crash>
-    <features>
-      <pae/>
-      <acpi/>
-      <apic/>
-    </features>
-    <devices>
-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
-      <interface type="bridge">
-        <source bridge="xenbr0"/>
-        <mac address="00:16:3e:5d:c7:9e"/>
-        <script path="vif-bridge"/>
-      </interface>
-      <disk type="file">
-        <source file="/root/fv0"/>
-        <target dev="hda"/>
-      </disk>
-      <disk type="file" device="cdrom">
-        <source file="/root/fc5-x86_64-boot.iso"/>
-        <target dev="hdc"/>
-        <readonly/>
-      </disk>
-      <disk type="file" device="floppy">
-        <source file="/root/fd.img"/>
-        <target dev="fda"/>
-      </disk>
-      <graphics type="vnc" port="5904"/>
-    </devices>
-  </domain>
-  <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>
-  <network>
-    <name>private</name>
-    <uuid>004b22212d78c30f5aa5f03c87d21e69</uuid>
-    <bridge name="brpriv"/>
-    <ip address="192.168.124.1" netmask="255.255.255.0">
-      <dhcp>
-        <range start="192.168.124.128" end="192.168.124.253"/>
-      </dhcp>
-    </ip>
-  </network>
-  <network>
-    <name>default</name>
-    <uuid>004b96e12d78c30f5aa5f03c87d21e69</uuid>
-    <bridge name="brdefault"/>
-    <forward dev="eth0"/>
-    <ip address="192.168.122.1" netmask="255.255.255.0">
-      <dhcp>
-        <range start="192.168.122.128" end="192.168.122.253"/>
-      </dhcp>
-    </ip>
-  </network>
-  <cpu>
-    <mhz>6000</mhz>
-    <model>i986</model>
-    <active>50</active>
-    <nodes>4</nodes>
-    <sockets>4</sockets>
-    <cores>4</cores>
-    <threads>2</threads>
-  </cpu>
-  <memory>8192000</memory>
-</node>

data/tests/tc_connect.rb

@@ -1,178 +0,0 @@
-require 'test/unit'
-
-$:.unshift(File::join(File::dirname(__FILE__), "..", "lib"))
-$:.unshift(File::join(File::dirname(__FILE__), "..", "ext", "libvirt"))
-require 'libvirt'
-
-class TestConnect < Test::Unit::TestCase
-
-    LIBVIRT_VERSION = Libvirt::version("Test")[0]
-
-    TEST_CAPS_OLD = "<capabilities>\n  <host>\n    <cpu>\n      <arch>i686</arch>\n      <features>\n        <pae/>\n        <nonpae/>\n      </features>\n    </cpu>\n  </host>\n\n  <guest>\n    <os_type>linux</os_type>\n    <arch name=\"i686\">\n      <wordsize>32</wordsize>\n      <domain type=\"test\"/>\n    </arch>\n    <features>\n      <pae/>\n      <nonpae/>\n    </features>\n  </guest>\n</capabilities>\n"
-
-    TEST_CAPS_0_40_1 = "<capabilities>\n\n  <host>\n    <cpu>\n      <arch>i686</arch>\n      <features>\n        <pae/>\n        <nonpae/>\n      </features>\n    </cpu>\n    <topology>\n      <cells num='2'>\n        <cell id='0'>\n          <cpus num='8'>\n            <cpu id='0'>\n            <cpu id='2'>\n            <cpu id='4'>\n            <cpu id='6'>\n            <cpu id='8'>\n            <cpu id='10'>\n            <cpu id='12'>\n            <cpu id='14'>\n          </cpus>\n        </cell>\n        <cell id='1'>\n          <cpus num='8'>\n            <cpu id='1'>\n            <cpu id='3'>\n            <cpu id='5'>\n            <cpu id='7'>\n            <cpu id='9'>\n            <cpu id='11'>\n            <cpu id='13'>\n            <cpu id='15'>\n          </cpus>\n        </cell>\n      </cells>\n    </topology>\n  </host>\n\n  <guest>\n    <os_type>linux</os_type>\n    <arch name='i686'>\n      <wordsize>32</wordsize>\n      <domain type='test'>\n      </domain>\n    </arch>\n    <features>\n      <pae/>\n      <nonpae/>\n    </features>\n  </guest>\n\n</capabilities>\n"
-
-    if LIBVIRT_VERSION.major >= 0 &&
-            LIBVIRT_VERSION.minor >= 4 &&
-            LIBVIRT_VERSION.release >= 1
-        TEST_CAPS = TEST_CAPS_0_40_1
-    else
-        TEST_CAPS = TEST_CAPS_OLD
-    end
-
-    UUID = "4dea22b3-1d52-d8f3-2516-782e98ab3fa0"
-
-    NETWORK_UUID = "004b96e1-2d78-c30f-5aa5-f03c87d21e69"
-
-    NETWORK_XML = "<network>
-  <name>local</name>
-  <uuid>9b562b27-0969-4b39-8c96-ef7858152ccc</uuid>
-  <bridge name='virbr0'/>
-  <forward/>
-  <ip address='172.31.122.1' netmask='255.255.255.0'>
-    <dhcp>
-      <range start='172.31.122.2' end='172.31.122.254'/>
-    </dhcp>
-  </ip>
-</network>
-"
-
-    def test_url
-        "test://" + File::join(File::expand_path(File::dirname(__FILE__)),
-                               "node.xml")
-    end
-
-    def connect
-        c = Libvirt::open(test_url)
-        assert_not_nil(c)
-        assert(! c.closed?)
-        return c
-    end
-
-    def test_open
-        c = connect
-        assert_nothing_raised {
-            c.close
-        }
-        assert(c.closed?)
-        assert_nothing_raised {
-            c.close
-        }
-        assert(c.closed?)
-    end
-
-    def test_node_info
-        ni = connect.node_get_info
-        assert_equal(4, ni.nodes)
-        assert_equal(50, ni.cpus)
-        assert_equal(2, ni.threads)
-        assert_equal(4, ni.sockets)
-        assert_equal(6000, ni.mhz)
-        assert_equal(4, ni.cores)
-        assert_equal("i986", ni.model)
-    end
-
-    def test_misc
-        c = connect
-        assert_equal("Test", c.type)
-        assert_equal(2, c.version)
-        hostname=`hostname`.chomp
-
-        assert_nothing_raised {
-            c.lookup_network_by_name("default").create
-        }
-
-        assert_equal(hostname, c.hostname)
-        assert_equal(test_url, c.uri)
-        assert_equal(32, c.max_vcpus("bogus"))
-        assert(c.capabilities.size > 0)
-        assert_equal(2, c.num_of_domains)
-        assert_equal([1, 2], c.list_domains.sort)
-        assert_equal(0, c.num_of_defined_domains)
-        assert_equal([], c.list_defined_domains)
-        assert_equal(1, c.num_of_networks)
-        assert_equal(["default"], c.list_networks)
-        assert_equal(1, c.num_of_defined_networks)
-        assert_equal(["private"], c.list_defined_networks)
-
-        v = Libvirt::version("Test")
-        assert_equal("libvirt", v[0].type)
-        assert_equal("Test", v[1].type)
-    end
-
-    def test_domain
-        c = connect
-
-        dom = c.lookup_domain_by_id(1)
-        assert_equal("fv0", dom.name)
-        assert_equal("linux", dom.os_type)
-        assert_equal(UUID, dom.uuid)
-        assert_equal(UUID, c.lookup_domain_by_uuid(UUID).uuid)
-        assert_equal(UUID, c.lookup_domain_by_name("fv0").uuid)
-
-        info = dom.info
-        assert_equal(8388608, info.max_mem)
-        assert_equal(2097152, info.memory)
-        assert_equal(2, info.nr_virt_cpu)
-        assert_equal(Libvirt::Domain::RUNNING, info.state)
-
-        dom.memory = info.memory/2
-        dom.vcpus = 1
-        info = dom.info
-        assert_equal(2097152/2, info.memory)
-        assert_equal(1, info.nr_virt_cpu)
-
-        # pin_vcpu is not implemented in the test driver
-        # enable this once it becomes available
-        # dom.pin_vcpu(0,[0])
-
-        dom.free()
-        assert_raise ArgumentError do
-            dom.name
-        end
-    end
-
-    def test_error
-        c = connect
-        raised = false
-        begin
-            c.lookup_domain_by_id(42)
-        rescue Libvirt::RetrieveError => e
-            raised = true
-            assert(e.message.size > 0)
-            assert_equal("virDomainLookupByID", e.libvirt_function_name)
-            assert_not_nil e.libvirt_message
-        end
-        assert(raised)
-    end
-
-    def test_network
-        c = connect
-
-        netw = c.lookup_network_by_name("default")
-        assert_equal("default", netw.name)
-        assert_equal("brdefault", netw.bridge_name)
-        uuid = NETWORK_UUID
-        assert_equal(uuid, netw.uuid)
-        assert_equal(uuid, c.lookup_network_by_uuid(uuid).uuid)
-        assert_equal(uuid, c.lookup_network_by_name("default").uuid)
-        assert_equal(false, netw.autostart)
-        netw.autostart = true
-        assert_equal(true, netw.autostart)
-        netw.autostart = false
-        assert_equal(false, netw.autostart)
-
-        netw = c.define_network_xml(NETWORK_XML)
-        assert(netw.xml_desc.size > 0)
-        assert_equal(c, netw.connection)
-
-        netw.create
-        assert_equal(1, c.num_of_networks)
-        assert_equal(["local"], c.list_networks)
-
-        netw.free
-        assert_raise ArgumentError do
-            netw.name
-        end
-    end
-end