virtinst: Drop direct 'support' usage

Except from connection. This requires some reorg in clitest and
some minor changes in a few other places

4 files changed, 8 insertions, 7 deletions

diff --git a/virtinst/__init__.py b/virtinst/__init__.py
index 1a88af72..873998a6 100644
--- a/virtinst/__init__.py
+++ b/virtinst/__init__.py
@@ -25,7 +25,6 @@ _setup_i18n()
 stable_defaults = _CLIConfig.stable_defaults
 
 from virtinst import util
-from virtinst import support
 from virtinst.uri import URI
 from virtinst.osdict import OSDB
 
diff --git a/virtinst/connection.py b/virtinst/connection.py
index 0750a597..cbd51600 100644
--- a/virtinst/connection.py
+++ b/virtinst/connection.py
@@ -421,6 +421,11 @@ class VirtinstConnection(object):
                 return False
         return True
 
+    def _check_version(self, version):
+        # Entry point for the test suite to do simple version checks,
+        # actual code should only use check_support
+        return support.check_version(self, version)
+
     def support_remote_url_install(self):
         if self._magic_uri:
             return False
diff --git a/virtinst/guest.py b/virtinst/guest.py
index 6e27e4d8..f51e6f7a 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -15,7 +15,6 @@ import libvirt
 from virtcli import CLIConfig
 
 from . import util
-from . import support
 from .devices import *  # pylint: disable=wildcard-import
 from .distroinstaller import DistroInstaller
 from .domain import *  # pylint: disable=wildcard-import
@@ -1104,11 +1103,9 @@ class Guest(XMLBuilder):
     def _set_sound_defaults(self):
         if self.os.is_q35():
             default = "ich9"
-        elif self.conn.check_support(
-                support.SUPPORT_CONN_SOUND_ICH6):
+        elif self.conn.check_support(self.conn.SUPPORT_CONN_SOUND_ICH6):
             default = "ich6"
-        elif self.conn.check_support(
-                support.SUPPORT_CONN_SOUND_AC97):
+        elif self.conn.check_support(self.conn.SUPPORT_CONN_SOUND_AC97):
             default = "ac97"
         else:
             default = "es1370"
diff --git a/virtinst/support.py b/virtinst/support.py
index 9b00739e..dc9fe006 100644
--- a/virtinst/support.py
+++ b/virtinst/support.py
@@ -405,7 +405,7 @@ def check_support(virtconn, feature, data=None):
     return sobj.check_support(virtconn, data)
 
 
-def _check_version(virtconn, version):
+def check_version(virtconn, version):
     """
     Check libvirt version. Useful for the test suite so we don't need
     to keep adding new support checks.