From nobody Wed May 14 16:09:35 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 1523013663817689.0048350619627; Fri, 6 Apr 2018 04:21:03 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4BAE3C057F92; Fri, 6 Apr 2018 11:21:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0C5B41882C; Fri, 6 Apr 2018 11:21:02 +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 760DE180215E; Fri, 6 Apr 2018 11:21:01 +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 w36BKfJG027317 for ; Fri, 6 Apr 2018 07:20:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2ED682166BC7; Fri, 6 Apr 2018 11:20:41 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1DE92166BAE for ; Fri, 6 Apr 2018 11:20:40 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 6 Apr 2018 13:20:31 +0200 Message-Id: <20180406112034.31179-7-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 6/9] Implement GetXMLDesc method for Network 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 06 Apr 2018 11:21:02 +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.Network.xml | 6 ++++++ src/network.c | 28 ++++++++++++++++++++++++++++ test/test_network.py | 5 +++++ 3 files changed, 39 insertions(+) diff --git a/data/org.libvirt.Network.xml b/data/org.libvirt.Network.xml index 46198fe..456217a 100644 --- a/data/org.libvirt.Network.xml +++ b/data/org.libvirt.Network.xml @@ -27,6 +27,12 @@ + + + + + diff --git a/src/network.c b/src/network.c index bb385d3..bd9e86a 100644 --- a/src/network.c +++ b/src/network.c @@ -147,6 +147,33 @@ virtDBusNetworkDestroy(GVariant *inArgs G_GNUC_UNUSED, virtDBusUtilSetLastVirtError(error); } =20 +static void +virtDBusNetworkGetXMLDesc(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virNetwork) network =3D NULL; + g_autofree gchar *xml =3D NULL; + guint flags; + + g_variant_get(inArgs, "(u)", &flags); + + network =3D virtDBusNetworkGetVirNetwork(connect, objectPath, error); + if (!network) + return; + + xml =3D virNetworkGetXMLDesc(network, flags); + if (!xml) + return virtDBusUtilSetLastVirtError(error); + + *outArgs =3D g_variant_new("(s)", xml); +} + static void virtDBusNetworkUndefine(GVariant *inArgs G_GNUC_UNUSED, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -178,6 +205,7 @@ static virtDBusGDBusPropertyTable virtDBusNetworkProper= tyTable[] =3D { static virtDBusGDBusMethodTable virtDBusNetworkMethodTable[] =3D { { "Create", virtDBusNetworkCreate }, { "Destroy", virtDBusNetworkDestroy }, + { "GetXMLDesc", virtDBusNetworkGetXMLDesc }, { "Undefine", virtDBusNetworkUndefine }, { 0 } }; diff --git a/test/test_network.py b/test/test_network.py index 8ec54ad..397fc0c 100755 --- a/test/test_network.py +++ b/test/test_network.py @@ -44,6 +44,11 @@ class TestNetwork(libvirttest.BaseTestClass): =20 self.main_loop() =20 + def test_network_get_xml_description(self): + _,test_network =3D self.test_network() + interface_obj =3D dbus.Interface(test_network, 'org.libvirt.Networ= k') + assert isinstance(interface_obj.GetXMLDesc(0), dbus.String) + def test_network_undefine(self): def domain_undefined(path, _event): assert isinstance(path, dbus.ObjectPath) --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list