summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Denemark <jdenemar@redhat.com>2013-01-23 12:14:57 +0100
committerJiri Denemark <jdenemar@redhat.com>2013-02-28 10:54:24 +0100
commit3b87cec14dfb84bafbe5ba8672ceee7d62a5d936 (patch)
tree25a3d6ee6a467ff8ce3e885935ab141cf620e922
parent2508c934bc82e40a1b35271e6ad8bcd73c05a73b (diff)
downloadlibvirt-python-v6-libvirt-0.10.2-18.el6_4.10.tar.gz
libvirt-python-v6-libvirt-0.10.2-18.el6_4.10.tar.xz
libvirt-python-v6-libvirt-0.10.2-18.el6_4.10.zip
https://bugzilla.redhat.com/show_bug.cgi?id=915348 virDomainSnapshot.getDomain() and virDomainSnapshot.getConnect() wrappers around virDomainSnapshotGet{Domain,Connect} were not supposed to be ever implemented. The class should contain proper domain() and connect() accessors that fetch python objects stored internally within the class. While domain() was already provided, connect() was missing. This patch adds connect() method to virDomainSnapshot class and reimplements getDomain() and getConnect() methods as aliases to domain() and connect() for backward compatibility. (cherry picked from commit 7b35fd718d2156224797ace08f752dfbb9884520) Conflicts: python/generator.py -- context
-rwxr-xr-xgenerator.py4
-rw-r--r--libvirt-override-virDomainSnapshot.py8
2 files changed, 11 insertions, 1 deletions
diff --git a/generator.py b/generator.py
index a98a894..9096f9e 100755
--- a/generator.py
+++ b/generator.py
@@ -497,6 +497,8 @@ skip_function = (
"virNWFilterGetConnect",
"virStoragePoolGetConnect",
"virStorageVolGetConnect",
+ "virDomainSnapshotGetConnect",
+ "virDomainSnapshotGetDomain",
)
qemu_skip_function = (
@@ -877,7 +879,6 @@ classes_destructors = {
class_skip_connect_impl = {
"virConnect" : True,
- "virDomainSnapshot": True,
}
class_domain_impl = {
@@ -1358,6 +1359,7 @@ def buildWrappers(module):
" self._conn = conn._conn\n")
elif classname in [ "virDomainSnapshot" ]:
classes.write(" self._dom = dom\n")
+ classes.write(" self._conn = dom.connect()\n")
classes.write(" if _obj != None:self._o = _obj;return\n")
classes.write(" self._o = None\n\n");
destruct=None
diff --git a/libvirt-override-virDomainSnapshot.py b/libvirt-override-virDomainSnapshot.py
index 3da7bfd..bf708a5 100644
--- a/libvirt-override-virDomainSnapshot.py
+++ b/libvirt-override-virDomainSnapshot.py
@@ -1,3 +1,11 @@
+ def getConnect(self):
+ """Get the connection that owns the domain that a snapshot was created for"""
+ return self.connect()
+
+ def getDomain(self):
+ """Get the domain that a snapshot was created for"""
+ return self.domain()
+
def listAllChildren(self, flags):
"""List all child snapshots and returns a list of snapshot objects"""
ret = libvirtmod.virDomainSnapshotListAllChildren(self._o, flags)