data/org.libvirt.Connect.xml | 4 ++++ src/connect.c | 25 ++++++++++++++++++++++++- test/test_connect.py | 9 +++++++++ 3 files changed, 37 insertions(+), 1 deletion(-)
---
data/org.libvirt.Connect.xml | 4 ++++
src/connect.c | 25 ++++++++++++++++++++++++-
test/test_connect.py | 9 +++++++++
3 files changed, 37 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 @@
<node name="/org/libvirt/connect">
<interface name="org.libvirt.Connect">
+ <property name="Version" type="t" access="read">
+ <annotation name="org.gtk.GDBus.DocString"
+ value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectGetVersion"/>
+ </property>
<method name="ListDomains">
<annotation name="org.gtk.GDBus.DocString"
value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectListAllDomains"/>
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;
}
+static void
+virtDBusConnectGetVersion(const gchar *objectPath G_GNUC_UNUSED,
+ gpointer userData,
+ GVariant **value,
+ GError **error)
+{
+ virtDBusConnect *connect = userData;
+ gulong hvVer;
+
+ if (!virtDBusConnectOpen(connect, error))
+ return;
+
+ if (virConnectGetVersion(connect->connection, &hvVer) < 0)
+ return virtDBusUtilSetLastVirtError(error);
+
+ *value = g_variant_new("t", hvVer);
+}
+
static void
virtDBusConnectListDomains(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -177,6 +195,11 @@ virtDBusConnectDefineXML(GVariant *inArgs,
*outArgs = g_variant_new("(o)", path);
}
+static virtDBusGDBusPropertyTable virtDBusConnectPropertyTable[] = {
+ { "Version", virtDBusConnectGetVersion, NULL },
+ { NULL, NULL, NULL }
+};
+
static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] = {
{ "ListDomains", virtDBusConnectListDomains },
{ "CreateXML", virtDBusConnectCreateXML },
@@ -228,7 +251,7 @@ virtDBusConnectNew(virtDBusConnect **connectp,
connect->connectPath,
interfaceInfo,
virtDBusConnectMethodTable,
- NULL,
+ virtDBusConnectPropertyTable,
connect);
virtDBusDomainRegister(connect, error);
diff --git a/test/test_connect.py b/test/test_connect.py
index a52140c..01d4d41 100755
--- a/test/test_connect.py
+++ b/test/test_connect.py
@@ -2,6 +2,7 @@
import dbus
import libvirttest
+import pytest
class TestConnect(libvirttest.BaseTestClass):
@@ -53,6 +54,14 @@ class TestConnect(libvirttest.BaseTestClass):
self.main_loop()
+ @pytest.mark.parametrize("property_name,expected_type", [
+ ("Version", dbus.UInt64),
+ ])
+ def test_connect_properties_return_type(self, property_name, expected_type):
+ obj = self.bus.get_object('org.libvirt', '/org/libvirt/Test')
+ props = obj.GetAll('org.libvirt.Connect', dbus_interface=dbus.PROPERTIES_IFACE)
+ assert isinstance(props[property_name], expected_type)
+
if __name__ == '__main__':
libvirttest.run()
--
2.15.0
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On Mon, Mar 26, 2018 at 05:19:22PM +0200, Katerina Koukiou wrote: > --- > data/org.libvirt.Connect.xml | 4 ++++ > src/connect.c | 25 ++++++++++++++++++++++++- > test/test_connect.py | 9 +++++++++ > 3 files changed, 37 insertions(+), 1 deletion(-) Thanks, I've pushed the patch. Pavel -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Mon, Mar 26, 2018 at 05:19:22PM +0200, Katerina Koukiou wrote: >--- > data/org.libvirt.Connect.xml | 4 ++++ > src/connect.c | 25 ++++++++++++++++++++++++- > test/test_connect.py | 9 +++++++++ > 3 files changed, 37 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 @@ > > <node name="/org/libvirt/connect"> > <interface name="org.libvirt.Connect"> >+ <property name="Version" type="t" access="read"> >+ <annotation name="org.gtk.GDBus.DocString" >+ value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectGetVersion"/> This one is documented in the libvirt-host file. Jan >+ </property> > <method name="ListDomains"> > <annotation name="org.gtk.GDBus.DocString" > value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectListAllDomains"/> -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Mon, Mar 26, 2018 at 05:54:17PM +0200, Ján Tomko wrote: > On Mon, Mar 26, 2018 at 05:19:22PM +0200, Katerina Koukiou wrote: > > --- > > data/org.libvirt.Connect.xml | 4 ++++ > > src/connect.c | 25 ++++++++++++++++++++++++- > > test/test_connect.py | 9 +++++++++ > > 3 files changed, 37 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 @@ > > > > <node name="/org/libvirt/connect"> > > <interface name="org.libvirt.Connect"> > > + <property name="Version" type="t" access="read"> > > + <annotation name="org.gtk.GDBus.DocString" > > + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectGetVersion"/> > > This one is documented in the libvirt-host file. > > Jan Nice catch, I'll fix it, thanks. Pavel -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Mon, Mar 26, 2018 at 05:19:22PM +0200, Katerina Koukiou wrote: > --- > data/org.libvirt.Connect.xml | 4 ++++ > src/connect.c | 25 ++++++++++++++++++++++++- > test/test_connect.py | 9 +++++++++ > 3 files changed, 37 insertions(+), 1 deletion(-) Looks like that the git hook that checks Signed-off-by is enabled also for libvirt-dbus repository it needs to be added. If you agree with it I can add it there before pushing. Next time please make sure that the Signed-off-by line is in the commit message. Since this patch is not pushed, I'll fix the URL as well before pushing. Pavel -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Mon, 2018-03-26 at 18:09 +0200, Pavel Hrdina wrote: > On Mon, Mar 26, 2018 at 05:19:22PM +0200, Katerina Koukiou wrote: > > --- > > data/org.libvirt.Connect.xml | 4 ++++ > > src/connect.c | 25 ++++++++++++++++++++++++- > > test/test_connect.py | 9 +++++++++ > > 3 files changed, 37 insertions(+), 1 deletion(-) > > Looks like that the git hook that checks Signed-off-by is enabled > also > for libvirt-dbus repository it needs to be added. If you agree with > it I can add it there before pushing. Sure, thanks. > Next time please make sure that > the Signed-off-by line is in the commit message. > > Since this patch is not pushed, I'll fix the URL as well before > pushing. Ok. > Pavel Katerina -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
© 2016 - 2024 Red Hat, Inc.