From nobody Sun Apr 28 22:56:45 2024 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 152207629916817.397625902654795; Mon, 26 Mar 2018 07:58:19 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B0EC87F6A0; Mon, 26 Mar 2018 14:58:17 +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 64946601A1; Mon, 26 Mar 2018 14:58:17 +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 9D7A0181B9FF; Mon, 26 Mar 2018 14:58:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2QEwExv003478 for ; Mon, 26 Mar 2018 10:58:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id D48AF10EE95E; Mon, 26 Mar 2018 14:58:14 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A14010EE95B for ; Mon, 26 Mar 2018 14:58:14 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Mon, 26 Mar 2018 16:58:08 +0200 Message-Id: <20180326145809.10338-2-kkoukiou@redhat.com> In-Reply-To: <20180326145809.10338-1-kkoukiou@redhat.com> References: <20180326145809.10338-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 1/2] Add 'Version' property for virConnectGetVersion 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 26 Mar 2018 14:58:18 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" --- data/org.libvirt.Connect.xml | 4 ++++ src/connect.c | 25 ++++++++++++++++++++++++- test/test_connect.py | 8 ++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index e47c2f5..56a1126 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -3,6 +3,10 @@ =20 + + + diff --git a/src/connect.c b/src/connect.c index bf97cd5..8898e6d 100644 --- a/src/connect.c +++ b/src/connect.c @@ -80,6 +80,24 @@ virtDBusConnectOpen(virtDBusConnect *connect, return TRUE; } =20 +static void +virtDBusConnectGetVersion(const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **value, + GError **error) +{ + virtDBusConnect *connect =3D userData; + gulong hvVer; + + if (!virtDBusConnectOpen(connect, error)) + return; + + if (virConnectGetVersion(connect->connection, &hvVer) < 0) + return virtDBusUtilSetLastVirtError(error); + + *value =3D g_variant_new("t", hvVer); +} + static void virtDBusConnectListDomains(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -177,6 +195,11 @@ virtDBusConnectDefineXML(GVariant *inArgs, *outArgs =3D g_variant_new("(o)", path); } =20 +static virtDBusGDBusPropertyTable virtDBusConnectPropertyTable[] =3D { + { "Version", virtDBusConnectGetVersion, NULL }, + { NULL, NULL, NULL } +}; + static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] =3D { { "ListDomains", virtDBusConnectListDomains }, { "CreateXML", virtDBusConnectCreateXML }, @@ -228,7 +251,7 @@ virtDBusConnectNew(virtDBusConnect **connectp, connect->connectPath, interfaceInfo, virtDBusConnectMethodTable, - NULL, + virtDBusConnectPropertyTable, connect); =20 virtDBusDomainRegister(connect, error); diff --git a/test/test_connect.py b/test/test_connect.py index a52140c..02a7161 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -2,6 +2,7 @@ =20 import dbus import libvirttest +import pytest =20 =20 class TestConnect(libvirttest.BaseTestClass): @@ -53,6 +54,13 @@ class TestConnect(libvirttest.BaseTestClass): =20 self.main_loop() =20 + @pytest.mark.parametrize("property_name,expected_type", [ + ("Version", dbus.UInt64), + ]) + def test_connect_properties_return_type(self, property_name, expected_= type): + obj =3D self.bus.get_object('org.libvirt', '/org/libvirt/Test') + props =3D obj.GetAll('org.libvirt.Connect', dbus_interface=3Ddbus.= PROPERTIES_IFACE) + assert isinstance(props[property_name], expected_type) =20 if __name__ =3D=3D '__main__': libvirttest.run() --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun Apr 28 22:56:45 2024 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 152207631047946.521010649800814; Mon, 26 Mar 2018 07:58:30 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 34AD919CF9E; Mon, 26 Mar 2018 14:58:29 +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 026AB19E1F; Mon, 26 Mar 2018 14:58:29 +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 BF4614CA9C; Mon, 26 Mar 2018 14:58:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2QEwFH7003484 for ; Mon, 26 Mar 2018 10:58:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7486410EE95E; Mon, 26 Mar 2018 14:58:15 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1AE2B10EE95B for ; Mon, 26 Mar 2018 14:58:14 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Mon, 26 Mar 2018 16:58:09 +0200 Message-Id: <20180326145809.10338-3-kkoukiou@redhat.com> In-Reply-To: <20180326145809.10338-1-kkoukiou@redhat.com> References: <20180326145809.10338-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 2/2] Add 'NumOfDomains' property for virConnectGetNumOfDomains 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 26 Mar 2018 14:58:29 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" --- data/org.libvirt.Connect.xml | 4 ++++ src/connect.c | 20 ++++++++++++++++++++ test/test_connect.py | 1 + 3 files changed, 25 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 56a1126..a58504d 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -7,6 +7,10 @@ + + + diff --git a/src/connect.c b/src/connect.c index 8898e6d..3f01dca 100644 --- a/src/connect.c +++ b/src/connect.c @@ -98,6 +98,25 @@ virtDBusConnectGetVersion(const gchar *objectPath G_GNUC= _UNUSED, *value =3D g_variant_new("t", hvVer); } =20 +static void +virtDBusConnectNumOfDomains(const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **value, + GError **error) +{ + virtDBusConnect *connect =3D userData; + gint numdomains; + + if (!virtDBusConnectOpen(connect, error)) + return; + + numdomains =3D virConnectNumOfDomains(connect->connection); + if (numdomains < 0) + return virtDBusUtilSetLastVirtError(error); + + *value =3D g_variant_new("u", numdomains); +} + static void virtDBusConnectListDomains(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -197,6 +216,7 @@ virtDBusConnectDefineXML(GVariant *inArgs, =20 static virtDBusGDBusPropertyTable virtDBusConnectPropertyTable[] =3D { { "Version", virtDBusConnectGetVersion, NULL }, + { "NumOfDomains", virtDBusConnectNumOfDomains, NULL }, { NULL, NULL, NULL } }; =20 diff --git a/test/test_connect.py b/test/test_connect.py index 02a7161..c40c677 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -56,6 +56,7 @@ class TestConnect(libvirttest.BaseTestClass): =20 @pytest.mark.parametrize("property_name,expected_type", [ ("Version", dbus.UInt64), + ("NumOfDomains", dbus.UInt32), ]) def test_connect_properties_return_type(self, property_name, expected_= type): obj =3D self.bus.get_object('org.libvirt', '/org/libvirt/Test') --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list