connection: Add explicit API for getting virConnect object

4 files changed, 11 insertions, 9 deletions

diff --git a/virtManager/domain.py b/virtManager/domain.py
index c549be63..37f8f35d 100644
--- a/virtManager/domain.py
+++ b/virtManager/domain.py
@@ -1470,7 +1470,7 @@ class vmmDomain(vmmLibvirtObject):
         if unsafe:
             flags |= libvirt.VIR_MIGRATE_UNSAFE
 
-        destconn = destconn.get_backend().libvirtconn
+        destconn = destconn.get_backend().get_conn_for_api_arg()
         logging.debug("Migrating: conn=%s flags=%s dname=%s uri=%s rate=%s",
                       destconn, flags, newname, interface, rate)
 
diff --git a/virtinst/capabilities.py b/virtinst/capabilities.py
index d5c996e0..36ee431f 100644
--- a/virtinst/capabilities.py
+++ b/virtinst/capabilities.py
@@ -89,7 +89,7 @@ class CPUValues(object):
         if (conn and
             conn.check_support(conn.SUPPORT_CONN_CPU_MODEL_NAMES)):
             self._cpus = [CPUValuesModel(i) for i in
-                          conn.libvirtconn.getCPUModelNames(arch, 0)]
+                          conn.getCPUModelNames(arch, 0)]
             return self._cpus
 
         return []
diff --git a/virtinst/connection.py b/virtinst/connection.py
index 3cc5b79a..4d3a2130 100644
--- a/virtinst/connection.py
+++ b/virtinst/connection.py
@@ -104,10 +104,11 @@ class VirtualConnection(object):
     # Properties #
     ##############
 
-    # Proxy virConnect API calls
     def __getattr__(self, attr):
         if attr in self.__dict__:
             return self.__dict__[attr]
+
+        # Proxy virConnect API calls
         libvirtconn = self.__dict__.get("_libvirtconn")
         return getattr(libvirtconn, attr)
 
@@ -115,15 +116,16 @@ class VirtualConnection(object):
         return self._uri or self._open_uri
     uri = property(_get_uri)
 
-    libvirtconn = property(lambda self: getattr(self, "_libvirtconn"))
-
     def _get_caps(self):
         if not self._caps:
             self._caps = CapabilitiesParser.Capabilities(
-                                        self.libvirtconn.getCapabilities())
+                                        self._libvirtconn.getCapabilities())
         return self._caps
     caps = property(_get_caps)
 
+    def get_conn_for_api_arg(self):
+        return self._libvirtconn
+
 
     ##############
     # Public API #
@@ -274,7 +276,7 @@ class VirtualConnection(object):
             if not self.check_support(support.SUPPORT_CONN_LIBVERSION):
                 self._daemon_version = 0
             else:
-                self._daemon_version = self.libvirtconn.getLibVersion()
+                self._daemon_version = self._libvirtconn.getLibVersion()
         return self._daemon_version
 
     def conn_version(self):
@@ -285,7 +287,7 @@ class VirtualConnection(object):
             if not self.check_support(support.SUPPORT_CONN_GETVERSION):
                 self._conn_version = 0
             else:
-                self._conn_version = self.libvirtconn.getVersion()
+                self._conn_version = self._libvirtconn.getVersion()
         return self._conn_version
 
 
diff --git a/virtinst/support.py b/virtinst/support.py
index 4cfcc33c..fbc008e9 100644
--- a/virtinst/support.py
+++ b/virtinst/support.py
@@ -365,7 +365,7 @@ def check_support(virtconn, feature, data=None):
     @returns: True if feature is supported, False otherwise
     """
     if "VirtualConnection" in repr(data):
-        data = data.libvirtconn
+        data = data.get_conn_for_api_arg()
 
     sobj = _support_objs[feature - 1]
     return sobj.check_support(virtconn, data)