From nobody Wed May 14 20:01:51 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1523293568535635.7310369937418; Mon, 9 Apr 2018 10:06:08 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BD5E9C03D46B; Mon, 9 Apr 2018 17:06:05 +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 8E1E06090C; Mon, 9 Apr 2018 17:06:05 +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 5470F180BAD5; Mon, 9 Apr 2018 17:06:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w39H5st0018616 for ; Mon, 9 Apr 2018 13:05:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 86AB07C52; Mon, 9 Apr 2018 17:05:54 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2DD6A7C51 for ; Mon, 9 Apr 2018 17:05:54 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Mon, 9 Apr 2018 19:05:43 +0200 Message-Id: <20180409170543.7840-12-kkoukiou@redhat.com> In-Reply-To: <20180409170543.7840-1-kkoukiou@redhat.com> References: <20180409170543.7840-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH v2 11/11] APIs should appear in alphabetical order: Move ListDomains method 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 09 Apr 2018 17:06:06 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Also test was renamed from test_list_domains to test_connect_list_domains to follow the naming convention. Signed-off-by: Katerina Koukiou --- data/org.libvirt.Connect.xml | 12 +++---- src/connect.c | 82 ++++++++++++++++++++++------------------= ---- test/test_connect.py | 24 ++++++------- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 5b49ed9..55260cc 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -25,12 +25,6 @@ - - - - - @@ -73,6 +67,12 @@ + + + + + diff --git a/src/connect.c b/src/connect.c index 9820de5..a8ff43c 100644 --- a/src/connect.c +++ b/src/connect.c @@ -206,46 +206,6 @@ virtDBusConnectGetCapabilities(GVariant *inArgs G_GNUC= _UNUSED, *outArgs =3D g_variant_new("(s)", capabilities); } =20 -static void -virtDBusConnectListDomains(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(virDomainPtr) domains =3D NULL; - guint flags; - GVariantBuilder builder; - GVariant *gdomains; - - g_variant_get(inArgs, "(u)", &flags); - - if (!virtDBusConnectOpen(connect, error)) - return; - - if (virConnectListAllDomains(connect->connection, &domains, flags) < 0) - return virtDBusUtilSetLastVirtError(error); - - if (!*domains) - return; - - g_variant_builder_init(&builder, G_VARIANT_TYPE("ao")); - - for (gint i =3D 0; domains[i]; i++) { - g_autofree gchar *path =3D NULL; - path =3D virtDBusUtilBusPathForVirDomain(domains[i], - connect->domainPath); - - g_variant_builder_add(&builder, "o", path); - } - - gdomains =3D g_variant_builder_end(&builder); - *outArgs =3D g_variant_new_tuple(&gdomains, 1); -} - static void virtDBusConnectDomainCreateXML(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -413,6 +373,46 @@ virtDBusConnectGetSysinfo(GVariant *inArgs, *outArgs =3D g_variant_new("(s)", sysinfo); } =20 +static void +virtDBusConnectListDomains(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(virDomainPtr) domains =3D NULL; + guint flags; + GVariantBuilder builder; + GVariant *gdomains; + + g_variant_get(inArgs, "(u)", &flags); + + if (!virtDBusConnectOpen(connect, error)) + return; + + if (virConnectListAllDomains(connect->connection, &domains, flags) < 0) + return virtDBusUtilSetLastVirtError(error); + + if (!*domains) + return; + + g_variant_builder_init(&builder, G_VARIANT_TYPE("ao")); + + for (gint i =3D 0; domains[i]; i++) { + g_autofree gchar *path =3D NULL; + path =3D virtDBusUtilBusPathForVirDomain(domains[i], + connect->domainPath); + + g_variant_builder_add(&builder, "o", path); + } + + gdomains =3D g_variant_builder_end(&builder); + *outArgs =3D g_variant_new_tuple(&gdomains, 1); +} + static void virtDBusConnectListNetworks(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -575,7 +575,6 @@ static virtDBusGDBusPropertyTable virtDBusConnectProper= tyTable[] =3D { }; =20 static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] =3D { - { "ListDomains", virtDBusConnectListDomains }, { "DomainCreateXML", virtDBusConnectDomainCreateXML }, { "DomainDefineXML", virtDBusConnectDomainDefineXML }, { "DomainLookupByID", virtDBusConnectDomainLookupByID }, @@ -583,6 +582,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTa= ble[] =3D { { "DomainLookupByUUID", virtDBusConnectDomainLookupByUUID }, { "GetCapabilities", virtDBusConnectGetCapabilities }, { "GetSysinfo", virtDBusConnectGetSysinfo }, + { "ListDomains", virtDBusConnectListDomains }, { "ListNetworks", virtDBusConnectListNetworks }, { "NetworkCreateXML", virtDBusConnectNetworkCreateXML }, { "NetworkDefineXML", virtDBusConnectNetworkDefineXML }, diff --git a/test/test_connect.py b/test/test_connect.py index 8948947..a7b7ad6 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -30,18 +30,6 @@ class TestConnect(libvirttest.BaseTestClass): ''' =20 - def test_list_domains(self): - domains =3D self.connect.ListDomains(0) - assert isinstance(domains, dbus.Array) - assert len(domains) =3D=3D 1 - - for path in domains: - assert isinstance(path, dbus.ObjectPath) - domain =3D self.bus.get_object('org.libvirt', path) - - # ensure the path exists by calling Introspect on it - domain.Introspect(dbus_interface=3Ddbus.INTROSPECTABLE_IFACE) - def test_connect_domain_create_xml(self): def domain_started(path, _event): assert isinstance(path, dbus.ObjectPath) @@ -80,6 +68,18 @@ class TestConnect(libvirttest.BaseTestClass): path =3D getattr(self.connect, lookup_method_name)(props[lookup_it= em]) assert original_path =3D=3D path =20 + def test_connect_list_domains(self): + domains =3D self.connect.ListDomains(0) + assert isinstance(domains, dbus.Array) + assert len(domains) =3D=3D 1 + + for path in domains: + assert isinstance(path, dbus.ObjectPath) + domain =3D self.bus.get_object('org.libvirt', path) + + # ensure the path exists by calling Introspect on it + domain.Introspect(dbus_interface=3Ddbus.INTROSPECTABLE_IFACE) + @pytest.mark.parametrize("property_name,expected_type", [ ("Encrypted", dbus.Boolean), ("Hostname", dbus.String), --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list