ruby-libvirt 0.5.2 → 0.6.0

data/ext/libvirt/network.c

@@ -2,7 +2,7 @@
  * network.c: virNetwork methods
  *
  * Copyright (C) 2007,2010 Red Hat Inc.
- * Copyright (C) 2013 Chris Lalancette <clalancette@gmail.com>
+ * Copyright (C) 2013,2014 Chris Lalancette <clalancette@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -107,7 +107,7 @@ static VALUE libvirt_network_destroy(VALUE n)
 
 /*
  * call-seq:
- *   net.name -> string
+ *   net.name -> String
  *
  * Call virNetworkGetName[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkGetName]
  * to retrieve the name of this network.
@@ -121,7 +121,7 @@ static VALUE libvirt_network_name(VALUE n)
 
 /*
  * call-seq:
- *   net.uuid -> string
+ *   net.uuid -> String
  *
  * Call virNetworkGetUUIDString[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkGetUUIDString]
  * to retrieve the UUID of this network.
@@ -134,7 +134,7 @@ static VALUE libvirt_network_uuid(VALUE n)
 
 /*
  * call-seq:
- *   net.xml_desc(flags=0) -> string
+ *   net.xml_desc(flags=0) -> String
  *
  * Call virNetworkGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkGetXMLDesc]
  * to retrieve the XML for this network.
@@ -153,7 +153,7 @@ static VALUE libvirt_network_xml_desc(int argc, VALUE *argv, VALUE n)
 
 /*
  * call-seq:
- *   net.bridge_name -> string
+ *   net.bridge_name -> String
  *
  * Call virNetworkGetBridgeName[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkGetBridgeName]
  * to retrieve the bridge name for this network.
@@ -246,6 +246,84 @@ static VALUE libvirt_network_persistent_p(VALUE n)
 }
 #endif
 
+#if HAVE_VIRNETWORKGETDHCPLEASES
+struct leases_arg {
+    virNetworkDHCPLeasePtr *leases;
+    int nleases;
+};
+
+static VALUE leases_wrap(VALUE arg)
+{
+    struct leases_arg *e = (struct leases_arg *)arg;
+    VALUE result, hash;
+    virNetworkDHCPLeasePtr lease;
+    int i;
+
+    result = rb_ary_new2(e->nleases);
+
+    for (i = 0; i < e->nleases; i++) {
+        lease = e->leases[i];
+
+        hash = rb_hash_new();
+        rb_hash_aset(hash, rb_str_new2("iface"), rb_str_new2(lease->iface));
+        rb_hash_aset(hash, rb_str_new2("expirytime"),
+                     LL2NUM(lease->expirytime));
+        rb_hash_aset(hash, rb_str_new2("type"), INT2NUM(lease->type));
+        rb_hash_aset(hash, rb_str_new2("mac"), rb_str_new2(lease->mac));
+        rb_hash_aset(hash, rb_str_new2("iaid"), rb_str_new2(lease->iaid));
+        rb_hash_aset(hash, rb_str_new2("ipaddr"), rb_str_new2(lease->ipaddr));
+        rb_hash_aset(hash, rb_str_new2("prefix"), UINT2NUM(lease->prefix));
+        rb_hash_aset(hash, rb_str_new2("hostname"),
+                     rb_str_new2(lease->hostname));
+        rb_hash_aset(hash, rb_str_new2("clientid"),
+                     rb_str_new2(lease->clientid));
+
+        rb_ary_store(result, i, hash);
+    }
+
+    return result;
+}
+
+/*
+ * call-seq:
+ *   net.dhcp_leases(mac=nil, flags=0) -> Hash
+ *
+ * Call virNetworkGetDHCPLeases[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkGetDHCPLeases]
+ * to retrieve the leases for this network.
+ */
+static VALUE libvirt_network_get_dhcp_leases(int argc, VALUE *argv, VALUE n)
+{
+    VALUE mac, flags, result;
+    int nleases, i = 0, exception = 0;
+    virNetworkDHCPLeasePtr *leases = NULL;
+    struct leases_arg args;
+
+    rb_scan_args(argc, argv, "02", &mac, &flags);
+
+    nleases = virNetworkGetDHCPLeases(network_get(n),
+                                      ruby_libvirt_get_cstring_or_null(mac),
+                                      &leases,
+                                      ruby_libvirt_value_to_uint(flags));
+    ruby_libvirt_raise_error_if(nleases < 0, e_Error, "virNetworkGetDHCPLeases",
+                                ruby_libvirt_connect_get(n));
+
+    args.leases = leases;
+    args.nleases = nleases;
+    result = rb_protect(leases_wrap, (VALUE)&args, &exception);
+
+    for (i = 0; i < nleases; i++) {
+        virNetworkDHCPLeaseFree(leases[i]);
+    }
+    free(leases);
+
+    if (exception) {
+        rb_jump_tag(exception);
+    }
+
+    return result;
+}
+#endif
+
 #endif
 
 /*
@@ -450,5 +528,20 @@ void ruby_libvirt_network_init(void)
                     INT2NUM(VIR_NETWORK_UPDATE_COMMAND_DELETE));
 #endif
 
+#if HAVE_VIRNETWORKGETDHCPLEASES
+    rb_define_method(c_network, "dhcp_leases",
+                     libvirt_network_get_dhcp_leases, -1);
+#endif
+
+#if HAVE_CONST_VIR_IP_ADDR_TYPE_IPV4
+    rb_define_const(c_network, "IP_ADDR_TYPE_IPV4",
+                    INT2NUM(VIR_IP_ADDR_TYPE_IPV4));
+#endif
+
+#if HAVE_CONST_VIR_IP_ADDR_TYPE_IPV6
+    rb_define_const(c_network, "IP_ADDR_TYPE_IPV6",
+                    INT2NUM(VIR_IP_ADDR_TYPE_IPV6));
+#endif
+
 #endif
 }

data/ext/libvirt/nodedevice.c

@@ -46,7 +46,7 @@ VALUE ruby_libvirt_nodedevice_new(virNodeDevicePtr n, VALUE conn)
 
 /*
  * call-seq:
- *   nodedevice.name -> string
+ *   nodedevice.name -> String
  *
  * Call virNodeDeviceGetName[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceGetName]
  * to retrieve the name of the node device.
@@ -60,7 +60,7 @@ static VALUE libvirt_nodedevice_name(VALUE c)
 
 /*
  * call-seq:
- *   nodedevice.parent -> string
+ *   nodedevice.parent -> String
  *
  * Call virNodeDeviceGetParent[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceGetParent]
  * to retrieve the parent of the node device.
@@ -85,7 +85,7 @@ static VALUE libvirt_nodedevice_parent(VALUE c)
 
 /*
  * call-seq:
- *   nodedevice.num_of_caps -> fixnum
+ *   nodedevice.num_of_caps -> Fixnum
  *
  * Call virNodeDeviceNumOfCaps[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceNumOfCaps]
  * to retrieve the number of capabilities of the node device.
@@ -129,7 +129,7 @@ static VALUE libvirt_nodedevice_list_caps(VALUE c)
 
 /*
  * call-seq:
- *   nodedevice.xml_desc(flags=0) -> string
+ *   nodedevice.xml_desc(flags=0) -> String
  *
  * Call virNodeDeviceGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceGetXMLDesc]
  * to retrieve the XML for the node device.

data/ext/libvirt/nwfilter.c

@@ -60,7 +60,7 @@ static VALUE libvirt_nwfilter_undefine(VALUE n)
 
 /*
  * call-seq:
- *   nwfilter.name -> string
+ *   nwfilter.name -> String
  *
  * Call virNWFilterGetName[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterGetName]
  * to retrieve the network filter name.
@@ -74,7 +74,7 @@ static VALUE libvirt_nwfilter_name(VALUE n)
 
 /*
  * call-seq:
- *   nwfilter.uuid -> string
+ *   nwfilter.uuid -> String
  *
  * Call virNWFilterGetUUIDString[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterGetUUIDString]
  * to retrieve the network filter UUID.
@@ -87,7 +87,7 @@ static VALUE libvirt_nwfilter_uuid(VALUE n)
 
 /*
  * call-seq:
- *   nwfilter.xml_desc(flags=0) -> string
+ *   nwfilter.xml_desc(flags=0) -> String
  *
  * Call virNWFilterGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterGetXMLDesc]
  * to retrieve the XML for this network filter.

data/ext/libvirt/secret.c

@@ -46,7 +46,7 @@ VALUE ruby_libvirt_secret_new(virSecretPtr s, VALUE conn)
 
 /*
  * call-seq:
- *   secret.uuid -> string
+ *   secret.uuid -> String
  *
  * Call virSecretGetUUIDString[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretGetUUIDString]
  * to retrieve the UUID for this secret.
@@ -59,7 +59,7 @@ static VALUE libvirt_secret_uuid(VALUE s)
 
 /*
  * call-seq:
- *   secret.usagetype -> fixnum
+ *   secret.usagetype -> Fixnum
  *
  * Call virSecretGetUsageType[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretGetUsageType]
  * to retrieve the usagetype for this secret.
@@ -73,7 +73,7 @@ static VALUE libvirt_secret_usagetype(VALUE s)
 
 /*
  * call-seq:
- *   secret.usageid -> string
+ *   secret.usageid -> String
  *
  * Call virSecretGetUsageID[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretGetUsageID]
  * to retrieve the usageid for this secret.
@@ -87,7 +87,7 @@ static VALUE libvirt_secret_usageid(VALUE s)
 
 /*
  * call-seq:
- *   secret.xml_desc(flags=0) -> string
+ *   secret.xml_desc(flags=0) -> String
  *
  * Call virSecretGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretGetXMLDesc]
  * to retrieve the XML for this secret.
@@ -166,7 +166,7 @@ static VALUE libvirt_secret_value_equal(VALUE s, VALUE in)
 
 /*
  * call-seq:
- *   secret.value(flags=0) -> string
+ *   secret.value(flags=0) -> String
  *
  * Call virSecretGetValue[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretGetValue]
  * to retrieve the value from this secret.

data/ext/libvirt/storage.c

@@ -2,7 +2,7 @@
  * storage.c: virStoragePool and virStorageVolume methods
  *
  * Copyright (C) 2007,2010 Red Hat Inc.
- * Copyright (C) 2013 Chris Lalancette <clalancette@gmail.com>
+ * Copyright (C) 2013,2014 Chris Lalancette <clalancette@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -186,7 +186,7 @@ static VALUE libvirt_storage_pool_refresh(int argc, VALUE *argv, VALUE p)
 
 /*
  * call-seq:
- *   pool.name -> string
+ *   pool.name -> String
  *
  * Call virStoragePoolGetName[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolGetName]
  * to retrieve the name of this storage pool.
@@ -200,7 +200,7 @@ static VALUE libvirt_storage_pool_name(VALUE p)
 
 /*
  * call-seq:
- *   pool.uuid -> string
+ *   pool.uuid -> String
  *
  * Call virStoragePoolGetUUIDString[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolGetUUIDString]
  * to retrieve the UUID of this storage pool.
@@ -240,7 +240,7 @@ static VALUE libvirt_storage_pool_info(VALUE p)
 
 /*
  * call-seq:
- *   pool.xml_desc(flags=0) -> string
+ *   pool.xml_desc(flags=0) -> String
  *
  * Call virStoragePoolGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolGetXMLDesc]
  * to retrieve the XML for this storage pool.
@@ -297,7 +297,7 @@ static VALUE libvirt_storage_pool_autostart_equal(VALUE p, VALUE autostart)
 
 /*
  * call-seq:
- *   pool.num_of_volumes -> fixnum
+ *   pool.num_of_volumes -> Fixnum
  *
  * Call virStoragePoolNumOfVolumes[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolNumOfVolumes]
  * to retrieve the number of volumes in this storage pool.
@@ -438,7 +438,7 @@ static VALUE libvirt_storage_pool_lookup_vol_by_path(VALUE p, VALUE path)
 #if HAVE_VIRSTORAGEPOOLLISTALLVOLUMES
 /*
  * call-seq:
- *   pool.list_all_volumes(flags=0) -> array
+ *   pool.list_all_volumes(flags=0) -> Array
  *
  * Call virStoragePoolListAllVolumes[http://www.libvirt.org/html/libvirt-libvirt.html#virStoragePoolListAllVolumes]
  * to get an array of volume objects for all volumes.
@@ -455,7 +455,7 @@ static VALUE libvirt_storage_pool_list_all_volumes(int argc, VALUE *argv,
 
 /*
  * call-seq:
- *   vol.name -> string
+ *   vol.name -> String
  *
  * Call virStorageVolGetName[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolGetName]
  * to retrieve the name of this storage volume.
@@ -469,7 +469,7 @@ static VALUE libvirt_storage_vol_name(VALUE v)
 
 /*
  * call-seq:
- *   vol.key -> string
+ *   vol.key -> String
  *
  * Call virStorageVolGetKey[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolGetKey]
  * to retrieve the key for this storage volume.
@@ -498,7 +498,7 @@ static VALUE libvirt_storage_pool_create_volume_xml(int argc, VALUE *argv,
 
     vol = virStorageVolCreateXML(pool_get(p), StringValueCStr(xml),
                                  ruby_libvirt_value_to_uint(flags));
-    ruby_libvirt_raise_error_if(vol == NULL, e_Error, "virNetworkCreateXML",
+    ruby_libvirt_raise_error_if(vol == NULL, e_Error, "virStorageVolCreateXML",
                                 ruby_libvirt_connect_get(p));
 
     return vol_new(vol, ruby_libvirt_conn_attr(p));
@@ -525,7 +525,7 @@ static VALUE libvirt_storage_pool_create_volume_xml_from(int argc, VALUE *argv,
                                      vol_get(cloneval),
                                      ruby_libvirt_value_to_uint(flags));
     ruby_libvirt_raise_error_if(vol == NULL, e_Error,
-                                "virNetworkCreateXMLFrom",
+                                "virStorageVolCreateXMLFrom",
                                 ruby_libvirt_connect_get(p));
 
     return vol_new(vol, ruby_libvirt_conn_attr(p));
@@ -631,7 +631,7 @@ static VALUE libvirt_storage_vol_info(VALUE v)
 
 /*
  * call-seq:
- *   vol.xml_desc(flags=0) -> string
+ *   vol.xml_desc(flags=0) -> String
  *
  * Call virStorageVolGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolGetXMLDesc]
  * to retrieve the xml for this storage volume.
@@ -650,7 +650,7 @@ static VALUE libvirt_storage_vol_xml_desc(int argc, VALUE *argv, VALUE v)
 
 /*
  * call-seq:
- *   vol.path -> string
+ *   vol.path -> String
  *
  * Call virStorageVolGetPath[http://www.libvirt.org/html/libvirt-libvirt.html#virStorageVolGetPath]
  * to retrieve the path for this storage volume.
@@ -913,6 +913,9 @@ void ruby_libvirt_storage_init(void)
 #if HAVE_CONST_VIR_STORAGE_VOL_NETWORK
     rb_define_const(c_storage_vol, "NETWORK", INT2NUM(VIR_STORAGE_VOL_NETWORK));
 #endif
+#if HAVE_CONST_VIR_STORAGE_VOL_NETDIR
+    rb_define_const(c_storage_vol, "NETDIR", INT2NUM(VIR_STORAGE_VOL_NETDIR));
+#endif
 
     /* virStorageVolDeleteFlags */
     rb_define_const(c_storage_vol, "DELETE_NORMAL",

data/tests/test_conn.rb

@@ -16,8 +16,8 @@ cleanup_test_network(conn)
 
 # test setup
 begin
-  `rm -f /etc/sysconfig/network-scripts/ifcfg-ruby-libvirt-tester`
-  `brctl delbr ruby-libvirt-tester >& /dev/null`
+  `rm -f /etc/sysconfig/network-scripts/ifcfg-rb-libvirt-test`
+  `brctl delbr rb-libvirt-test >& /dev/null`
 rescue
 end
 `qemu-img create -f qcow2 #{$GUEST_DISK} 5G`
@@ -256,11 +256,11 @@ 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"}
+expect_success(conn, "name arg for running domain", "lookup_domain_by_name", "rb-libvirt-test") {|x| x.name == "rb-libvirt-test"}
 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"}
+expect_success(conn, "name arg for defined domain", "lookup_domain_by_name", "rb-libvirt-test") {|x| x.name == "rb-libvirt-test"}
 newdom.undefine
 
 # TESTGROUP: conn.lookup_domain_by_id
@@ -351,11 +351,9 @@ 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")
+expect_success(conn, "name arg", "lookup_interface_by_name", "rb-libvirt-test")
 
-newiface.destroy
-
-expect_success(conn, "name arg", "lookup_interface_by_name", "ruby-libvirt-tester")
+expect_success(conn, "name arg", "lookup_interface_by_name", "rb-libvirt-test")
 
 newiface.undefine
 
@@ -408,11 +406,11 @@ 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")
+expect_success(conn, "name arg", "lookup_network_by_name", "rb-libvirt-test")
 newnet.destroy
 
 newnet = conn.define_network_xml($new_net_xml)
-expect_success(conn, "name arg", "lookup_network_by_name", "ruby-libvirt-tester")
+expect_success(conn, "name arg", "lookup_network_by_name", "rb-libvirt-test")
 newnet.undefine
 
 # TESTGROUP: conn.lookup_network_by_uuid
@@ -499,7 +497,7 @@ 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")
+expect_success(conn, "name arg", "lookup_nwfilter_by_name", "rb-libvirt-test")
 
 newnw.undefine
 
@@ -593,12 +591,12 @@ 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")
+expect_success(conn, "name arg", "lookup_storage_pool_by_name", "rb-libvirt-test")
 
 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")
+expect_success(conn, "name arg", "lookup_storage_pool_by_name", "rb-libvirt-test")
 newpool.undefine
 
 # TESTGROUP: conn.lookup_storage_pool_by_uuid

data/tests/test_domain.rb

@@ -220,7 +220,7 @@ newdom.undefine
 
 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)
+#expect_fail(newdom, Libvirt::Error, "while no migration in progress", "migrate_set_max_downtime", 10)
 
 #newdom.migrate_to_uri("qemu://remote/system")
 #expect_success(newdom, "10 second downtime", "migrate_set_max_downtime", 10)
@@ -603,7 +603,7 @@ sleep 1
 
 expect_too_many_args(newdom, "name", 1)
 
-expect_success(newdom, "no args", "name") {|x| x == "ruby-libvirt-tester"}
+expect_success(newdom, "no args", "name") {|x| x == "rb-libvirt-test"}
 
 newdom.destroy
 
@@ -1187,7 +1187,7 @@ newdom.undefine
 
 newdom = conn.create_domain_xml($new_dom_xml)
 sleep 1
-expect_fail(newdom, Libvirt::Error, "while no migration in progress", "migrate_max_downtime=", 10)
+#expect_fail(newdom, Libvirt::Error, "while no migration in progress", "migrate_max_downtime=", 10)
 
 # FIXME: get this working
 #newdom.migrate_to_uri("qemu://remote/system")