From nobody Mon Dec 15 23:01:39 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 1524651677013902.7141889775451; Wed, 25 Apr 2018 03:21:17 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1034530C80A9; Wed, 25 Apr 2018 10:21:15 +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 5AFB417782; Wed, 25 Apr 2018 10:21:14 +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 D16B84CAB1; Wed, 25 Apr 2018 10:21:13 +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 w3PAKe4b005001 for ; Wed, 25 Apr 2018 06:20:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5422E215CDC8; Wed, 25 Apr 2018 10:20:40 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB9AC2166BC6 for ; Wed, 25 Apr 2018 10:20:39 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Wed, 25 Apr 2018 12:20:27 +0200 Message-Id: <20180425102030.31145-13-kkoukiou@redhat.com> In-Reply-To: <20180425102030.31145-1-kkoukiou@redhat.com> References: <20180425102030.31145-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 12/15] Implement GetMetadata method for Domain 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.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Wed, 25 Apr 2018 10:21:16 +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.Domain.xml | 9 +++++++++ src/domain.c | 41 +++++++++++++++++++++++++++++++++++++++++ tests/test_domain.py | 6 ++++++ 3 files changed, 56 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 168820b..5557030 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -245,6 +245,15 @@ + + + + + + + diff --git a/src/domain.c b/src/domain.c index 05ea680..4cd6a4f 100644 --- a/src/domain.c +++ b/src/domain.c @@ -1402,6 +1402,46 @@ virtDBusDomainGetMemoryParameters(GVariant *inArgs, *outArgs =3D g_variant_new_tuple(&grecords, 1); } =20 +static void +virtDBusDomainGetMetadata(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(virDomain) domain =3D NULL; + const gchar *typeStr; + gint type; + const gchar *uri; + guint flags; + g_autofree gchar *ret =3D NULL; + + g_variant_get(inArgs, "(&s&su)", &typeStr, &uri, &flags); + if (g_str_equal(uri, "")) + uri =3D NULL; + + domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + type =3D virtDBusDomainMetadataTypeFromString(typeStr); + if (type < 0) { + g_set_error(error, VIRT_DBUS_ERROR, VIRT_DBUS_ERROR_LIBVIRT, + "Can't get valid virDomainMetadataType from string '%s= '.", + typeStr); + return; + } + + ret =3D virDomainGetMetadata(domain, type, uri, flags); + if (!ret) + return virtDBusUtilSetLastVirtError(error); + + *outArgs =3D g_variant_new("(s)", ret); +} + static void virtDBusDomainGetSchedulerParameters(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -2416,6 +2456,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodT= able[] =3D { { "GetJobInfo", virtDBusDomainGetJobInfo }, { "GetJobStats", virtDBusDomainGetJobStats }, { "GetMemoryParameters", virtDBusDomainGetMemoryParameters }, + { "GetMetadata", virtDBusDomainGetMetadata }, { "GetSchedulerParameters", virtDBusDomainGetSchedulerParameters }, { "GetStats", virtDBusDomainGetStats }, { "GetTime", virtDBusDomainGetTime }, diff --git a/tests/test_domain.py b/tests/test_domain.py index f2ae215..d0cebcd 100755 --- a/tests/test_domain.py +++ b/tests/test_domain.py @@ -63,6 +63,12 @@ class TestDomain(libvirttest.BaseTestClass): =20 self.main_loop() =20 + def test_domain_metadata(self): + obj, domain =3D self.domain() + description_expected =3D "This is the Test domain" + domain.SetMetadata('description', description_expected, "", "", 0) + assert description_expected =3D=3D domain.GetMetadata('description= ', "", 0) + def test_resume(self): def domain_resumed(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