From nobody Wed May 14 16:16:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1523013659743306.2240803453218; Fri, 6 Apr 2018 04:20:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7CFB2356DF; Fri, 6 Apr 2018 11:20:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 51CE118160; Fri, 6 Apr 2018 11:20:58 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 10E0F4CAA1; Fri, 6 Apr 2018 11:20:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w36BKeBE027311 for ; Fri, 6 Apr 2018 07:20:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8235F2166BC7; Fri, 6 Apr 2018 11:20:40 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 215042166BAE for ; Fri, 6 Apr 2018 11:20:39 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 6 Apr 2018 13:20:30 +0200 Message-Id: <20180406112034.31179-6-kkoukiou@redhat.com> In-Reply-To: <20180406112034.31179-1-kkoukiou@redhat.com> References: <20180406112034.31179-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 5/9] Implement NetworkDefineXML method for Connect interface X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 06 Apr 2018 11:20:58 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: Pavel Hrdina --- data/org.libvirt.Connect.xml | 6 ++++++ src/connect.c | 29 +++++++++++++++++++++++++++++ test/test_connect.py | 12 ++++++++++++ 3 files changed, 47 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 5f5c5fe..e36b7f6 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -56,6 +56,12 @@ + + + + + diff --git a/src/connect.c b/src/connect.c index 759b9fb..3a0e969 100644 --- a/src/connect.c +++ b/src/connect.c @@ -358,6 +358,34 @@ virtDBusConnectNetworkCreateXML(GVariant *inArgs, *outArgs =3D g_variant_new("(o)", path); } =20 +static void +virtDBusConnectNetworkDefineXML(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virNetwork) network =3D NULL; + g_autofree gchar *path =3D NULL; + gchar *xml; + + g_variant_get(inArgs, "(&s)", &xml); + + if (!virtDBusConnectOpen(connect, error)) + return; + + network =3D virNetworkDefineXML(connect->connection, xml); + if (!network) + return virtDBusUtilSetLastVirtError(error); + + path =3D virtDBusUtilBusPathForVirNetwork(network, connect->networkPat= h); + + *outArgs =3D g_variant_new("(o)", path); +} + static void virtDBusNetworkLookupByName(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -428,6 +456,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTa= ble[] =3D { { "DomainLookupByUUID", virtDBusDomainLookupByUUID }, { "ListNetworks", virtDBusConnectListNetworks }, { "NetworkCreateXML", virtDBusConnectNetworkCreateXML }, + { "NetworkDefineXML", virtDBusConnectNetworkDefineXML }, { "NetworkLookupByName", virtDBusNetworkLookupByName }, { "NetworkLookupByUUID", virtDBusNetworkLookupByUUID }, { 0 } diff --git a/test/test_connect.py b/test/test_connect.py index e3b493b..c411eeb 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -112,6 +112,18 @@ class TestConnect(libvirttest.BaseTestClass): =20 self.main_loop() =20 + def test_connect_network_define_xml(self): + def network_defined(path, _event): + assert isinstance(path, dbus.ObjectPath) + self.loop.quit() + + self.connect.connect_to_signal('NetworkEvent', network_defined, ar= g1=3D'Defined') + + path =3D self.connect.NetworkDefineXML(self.minimal_network_xml) + assert isinstance(path, dbus.ObjectPath) + + self.main_loop() + @pytest.mark.parametrize("lookup_method_name,lookup_item", [ ("NetworkLookupByName", 'Name'), ("NetworkLookupByUUID", 'UUID'), --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list