[libvirt] [dbus PATCH 0/3] Last methods for Network Interface
Katerina Koukiou (3): Fix virtDBusUtilEnumFromString g_str_equal use Implement GetDHCPLeases method for Network Interface Implement Update method for Network Interface data/org.libvirt.Network.xml | 17 ++++++ src/network.c | 125 +++++++++++++++++++++++++++++++++++++++++++ src/util.c | 2 +- tests/test_network.py | 17 ++++++ 4 files changed, 160 insertions(+), 1 deletion(-) -- 2.15.0
Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com> --- src/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util.c b/src/util.c index 34ab83a..b21f2c5 100644 --- a/src/util.c +++ b/src/util.c @@ -146,7 +146,7 @@ virtDBusUtilEnumFromString(const gchar *const *types, return -1; for (i = 0; i < ntypes; i++) - if (g_str_equal(types[i], type) == 0) + if (g_str_equal(types[i], type)) return i; return -1; -- 2.15.0
On Wed, Apr 18, 2018 at 03:19:08PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com> --- src/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com> --- data/org.libvirt.Network.xml | 8 +++++++ src/network.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/data/org.libvirt.Network.xml b/data/org.libvirt.Network.xml index 48e3324..385eb82 100644 --- a/data/org.libvirt.Network.xml +++ b/data/org.libvirt.Network.xml @@ -36,6 +36,14 @@ <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkDestroy"/> </method> + <method name="GetDHCPLeases"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetDHCPLease... + Empty string can be used to pass a NULL as @mac argument."/> + <arg name="mac" type="s" direction="in"/> + <arg name="flags" type="u" direction="in"/> + <arg name="leases" type="a(stisssuss)" direction="out"/> + </method> <method name="GetXMLDesc"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetXMLDesc"/> diff --git a/src/network.c b/src/network.c index 1448777..492f0bd 100644 --- a/src/network.c +++ b/src/network.c @@ -209,6 +209,56 @@ virtDBusNetworkDestroy(GVariant *inArgs G_GNUC_UNUSED, virtDBusUtilSetLastVirtError(error); } +static void +virtDBusNetworkGetDHCPLeases(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect = userData; + g_autoptr(virNetwork) network = NULL; + const gchar *mac; + guint flags; + virNetworkDHCPLeasePtr *leases = NULL; + gint nleases; + GVariantBuilder builder; + GVariant *res; + + g_variant_get(inArgs, "(&su)", &mac, &flags); + if (g_str_equal(mac, "")) + mac = NULL; + + network = virtDBusNetworkGetVirNetwork(connect, objectPath, error); + if (!network) + return; + + nleases = virNetworkGetDHCPLeases(network, mac, &leases, flags); + if (nleases < 0) + return virtDBusUtilSetLastVirtError(error); + + g_variant_builder_init(&builder, G_VARIANT_TYPE("a(stisssuss)")); + for (gint i = 0; i < nleases; i++) { + virNetworkDHCPLeasePtr lease = leases[i]; + + g_variant_builder_add(&builder, "(stisssuss)", + lease->iface, lease->expirytime, + lease->type, lease->mac, + lease->iaid ? lease->iaid : "None" , + lease->ipaddr, lease->prefix, + lease->hostname ? lease->hostname : "None", + lease->clientid ? lease->clientid : "None"); + + virNetworkDHCPLeaseFree(leases[i]); + } + g_free(leases); + res = g_variant_builder_end(&builder); + + *outArgs = g_variant_new_tuple(&res, 1); +} + static void virtDBusNetworkGetXMLDesc(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -269,6 +319,7 @@ static virtDBusGDBusPropertyTable virtDBusNetworkPropertyTable[] = { static virtDBusGDBusMethodTable virtDBusNetworkMethodTable[] = { { "Create", virtDBusNetworkCreate }, { "Destroy", virtDBusNetworkDestroy }, + { "GetDHCPLeases", virtDBusNetworkGetDHCPLeases }, { "GetXMLDesc", virtDBusNetworkGetXMLDesc }, { "Undefine", virtDBusNetworkUndefine }, { 0 } -- 2.15.0
On Wed, Apr 18, 2018 at 03:19:09PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com> --- data/org.libvirt.Network.xml | 8 +++++++ src/network.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+)
diff --git a/data/org.libvirt.Network.xml b/data/org.libvirt.Network.xml index 48e3324..385eb82 100644 --- a/data/org.libvirt.Network.xml +++ b/data/org.libvirt.Network.xml @@ -36,6 +36,14 @@ <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkDestroy"/> </method> + <method name="GetDHCPLeases"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetDHCPLease... + Empty string can be used to pass a NULL as @mac argument."/> + <arg name="mac" type="s" direction="in"/> + <arg name="flags" type="u" direction="in"/> + <arg name="leases" type="a(stisssuss)" direction="out"/> + </method> <method name="GetXMLDesc"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetXMLDesc"/> diff --git a/src/network.c b/src/network.c index 1448777..492f0bd 100644 --- a/src/network.c +++ b/src/network.c @@ -209,6 +209,56 @@ virtDBusNetworkDestroy(GVariant *inArgs G_GNUC_UNUSED, virtDBusUtilSetLastVirtError(error); }
+static void +virtDBusNetworkGetDHCPLeases(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect = userData; + g_autoptr(virNetwork) network = NULL; + const gchar *mac; + guint flags; + virNetworkDHCPLeasePtr *leases = NULL; + gint nleases; + GVariantBuilder builder; + GVariant *res; + + g_variant_get(inArgs, "(&su)", &mac, &flags); + if (g_str_equal(mac, "")) + mac = NULL; + + network = virtDBusNetworkGetVirNetwork(connect, objectPath, error); + if (!network) + return; + + nleases = virNetworkGetDHCPLeases(network, mac, &leases, flags); + if (nleases < 0) + return virtDBusUtilSetLastVirtError(error); + + g_variant_builder_init(&builder, G_VARIANT_TYPE("a(stisssuss)")); + for (gint i = 0; i < nleases; i++) { + virNetworkDHCPLeasePtr lease = leases[i]; + + g_variant_builder_add(&builder, "(stisssuss)", + lease->iface, lease->expirytime, + lease->type, lease->mac,
I think that we can convert type from int to string, there are only two types, virIPAddrType.
+ lease->iaid ? lease->iaid : "None" , + lease->ipaddr, lease->prefix, + lease->hostname ? lease->hostname : "None", + lease->clientid ? lease->clientid : "None");
If the value can be NULL we should be consistent with our APIs and return empty string instead of "None" and to make it clear document it.
+ + virNetworkDHCPLeaseFree(leases[i]); + } + g_free(leases);
Freeing the memory like this is OK, but since libvirt-dbus uses the attribute cleanup convention this would require new function and registering that function, for example like we do for list of virNetwork virtDBusUtilVirNetworkListFree(). Pavel
Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com> --- data/org.libvirt.Network.xml | 9 ++++++ src/network.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ tests/test_network.py | 17 ++++++++++ 3 files changed, 100 insertions(+) diff --git a/data/org.libvirt.Network.xml b/data/org.libvirt.Network.xml index 385eb82..5ed42a0 100644 --- a/data/org.libvirt.Network.xml +++ b/data/org.libvirt.Network.xml @@ -54,5 +54,14 @@ <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkUndefine"/> </method> + <method name="Update"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkUpdate"/> + <arg name="command" type="s" direction="in"/> + <arg name="section" type="s" direction="in"/> + <arg name="parentIndex" type="i" direction="in"/> + <arg name="xml" type="s" direction="in"/> + <arg name="flags" type="u" direction="in"/> + </method> </interface> </node> diff --git a/src/network.c b/src/network.c index 492f0bd..a09998b 100644 --- a/src/network.c +++ b/src/network.c @@ -3,6 +3,32 @@ #include <libvirt/libvirt.h> +VIRT_DBUS_ENUM_DECL(virtDBusNetworkUpdateCommand) +VIRT_DBUS_ENUM_IMPL(virtDBusNetworkUpdateCommand, + VIR_NETWORK_UPDATE_COMMAND_LAST, + "none", + "modify", + "delete", + "add-last", + "add-first") + +VIRT_DBUS_ENUM_DECL(virtDBusNetworkUpdateSection) +VIRT_DBUS_ENUM_IMPL(virtDBusNetworkUpdateSection, + VIR_NETWORK_SECTION_LAST, + "none", + "bridge", + "domain", + "ip", + "ip-dhcp-host", + "ip-dhcp-range", + "forward", + "forward-interface", + "forward-pf", + "portgroup", + "dns-host", + "dns-txt", + "dns-srv") + static virNetworkPtr virtDBusNetworkGetVirNetwork(virtDBusConnect *connect, const gchar *objectPath, @@ -306,6 +332,53 @@ virtDBusNetworkUndefine(GVariant *inArgs G_GNUC_UNUSED, virtDBusUtilSetLastVirtError(error); } +static void +virtDBusNetworkUpdate(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect = userData; + g_autoptr(virNetwork) network = NULL; + const gchar *commandStr; + gint command; + const gchar *sectionStr; + gint section; + gint parentIndex; + const gchar *xml; + guint flags; + + g_variant_get(inArgs, "(&s&si&su)", + &commandStr, §ionStr, + &parentIndex, &xml, &flags); + + command = virtDBusNetworkUpdateCommandTypeFromString(commandStr); + if (command < 0) { + g_set_error(error, VIRT_DBUS_ERROR, VIRT_DBUS_ERROR_LIBVIRT, + "Can't get valid virNetworkUpdateCommand from string '%s'.", + commandStr); + return; + } + section = virtDBusNetworkUpdateSectionTypeFromString(sectionStr); + if (section < 0) { + g_set_error(error, VIRT_DBUS_ERROR, VIRT_DBUS_ERROR_LIBVIRT, + "Can't get valid virNetworkUpdateSection from string '%s'.", + sectionStr); + return; + } + + network = virtDBusNetworkGetVirNetwork(connect, objectPath, error); + if (!network) + return; + + if (virNetworkUpdate(network, command, section, + parentIndex, xml, flags) < 0) + virtDBusUtilSetLastVirtError(error); +} + static virtDBusGDBusPropertyTable virtDBusNetworkPropertyTable[] = { { "Active", virtDBusNetworkGetActive, NULL }, { "Autostart", virtDBusNetworkGetAutostart, virtDBusNetworkSetAutostart }, @@ -322,6 +395,7 @@ static virtDBusGDBusMethodTable virtDBusNetworkMethodTable[] = { { "GetDHCPLeases", virtDBusNetworkGetDHCPLeases }, { "GetXMLDesc", virtDBusNetworkGetXMLDesc }, { "Undefine", virtDBusNetworkUndefine }, + { "Update", virtDBusNetworkUpdate }, { 0 } }; diff --git a/tests/test_network.py b/tests/test_network.py index 0dda923..2c1bd21 100755 --- a/tests/test_network.py +++ b/tests/test_network.py @@ -2,11 +2,17 @@ import dbus import libvirttest +import pytest class TestNetwork(libvirttest.BaseTestClass): """ Tests for methods and properties of the Network interface """ + + ip_dhcp_host_xml = ''' + <host mac='00:16:3e:77:e2:ed' name='foo.example.com' ip='192.168.122.10'/> + ''' + def test_network_properties_type(self): """ Ensure correct return type for Network properties """ @@ -73,5 +79,16 @@ class TestNetwork(libvirttest.BaseTestClass): self.main_loop() + @pytest.mark.parametrize("command, section, parentIndex, xml_str, flags", [ + ('add-first', 'ip-dhcp-host', 0, ip_dhcp_host_xml, 0), + ]) + def test_network_update(self, command, section, parentIndex, xml_str, flags): + _, test_network = self.test_network() + interface_obj = dbus.Interface(test_network, 'org.libvirt.Network') + interface_obj.Update(command, section, parentIndex, xml_str, flags) + updated_netxml = interface_obj.GetXMLDesc(0) + assert (xml_str.strip() in updated_netxml) + + if __name__ == '__main__': libvirttest.run() -- 2.15.0
On Wed, Apr 18, 2018 at 03:19:10PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com> --- data/org.libvirt.Network.xml | 9 ++++++ src/network.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ tests/test_network.py | 17 ++++++++++ 3 files changed, 100 insertions(+)
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
participants (2)
-
Katerina Koukiou -
Pavel Hrdina