virtinst: Guest: Simplify passing in a connection

tests/__init__.py

@@ -26,7 +26,6 @@ from tests import utils
 # Force certain helpers to return consistent values
 virtinst.util.is_blktap_capable = lambda: False
 virtinst.util.default_bridge = lambda ignore1: ["bridge", "eth0"]
-virtinst.Guest._open_uri = lambda ignore1, ignore2: None
 
 # Setup logging
 rootLogger = logging.getLogger()

tests/urltest.py

@@ -225,8 +225,7 @@ urls = {
 
 
 testconn = libvirt.open("test:///default")
-testguest = virtinst.Guest(conn=testconn,
+testguest = virtinst.Guest(testconn, installer=virtinst.DistroInstaller())
-                           installer=virtinst.DistroInstaller())
 
 
 class TestURLFetch(unittest.TestCase):

tests/utils.py

@@ -167,7 +167,7 @@ def diff_compare(actual_out, filename=None, expect_out=None):
 
 
 def get_basic_paravirt_guest(installer=None):
-    g = virtinst.Guest(conn=_conn, type="xen")
+    g = virtinst.Guest(_conn, type="xen")
     g.name = "TestGuest"
     g.memory = int(200)
     g.maxmemory = int(400)
@@ -187,7 +187,7 @@ def get_basic_paravirt_guest(installer=None):
 
 
 def get_basic_fullyvirt_guest(typ="xen", installer=None):
-    g = virtinst.Guest(conn=_conn, type=typ)
+    g = virtinst.Guest(_conn, type=typ)
     g.name = "TestGuest"
     g.memory = int(200)
     g.maxmemory = int(400)

tests/validation.py

@@ -425,7 +425,7 @@ class TestValidation(unittest.TestCase):
 
     # Actual Tests
     def testGuestValidation(self):
-        g = virtinst.Guest(conn=testconn, type="xen")
+        g = virtinst.Guest(testconn, type="xen")
         self._testArgs(g, virtinst.Guest, 'guest')
 
     def testDiskValidation(self):

tests/xmlparse.py

@@ -36,7 +36,7 @@ class XMLParseTest(unittest.TestCase):
 
     def _roundtrip_compare(self, filename):
         expectXML = sanitize_file_xml(file(filename).read())
-        guest = virtinst.Guest(conn=conn, parsexml=expectXML)
+        guest = virtinst.Guest(conn, parsexml=expectXML)
         actualXML = guest.get_xml_config()
         utils.diff_compare(actualXML, expect_out=expectXML)
 
@@ -88,7 +88,7 @@ class XMLParseTest(unittest.TestCase):
         """
         infile  = "tests/xmlparse-xml/change-guest-in.xml"
         outfile = "tests/xmlparse-xml/change-guest-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         check = self._make_checker(guest)
@@ -170,7 +170,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterMinimalGuest(self):
         infile  = "tests/xmlparse-xml/change-minimal-guest-in.xml"
         outfile = "tests/xmlparse-xml/change-minimal-guest-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         check = self._make_checker(guest.features)
@@ -204,7 +204,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterBootMulti(self):
         infile  = "tests/xmlparse-xml/change-boot-multi-in.xml"
         outfile = "tests/xmlparse-xml/change-boot-multi-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         check = self._make_checker(guest.installer.bootconfig)
@@ -219,7 +219,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterBootKernel(self):
         infile  = "tests/xmlparse-xml/change-boot-kernel-in.xml"
         outfile = "tests/xmlparse-xml/change-boot-kernel-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         check = self._make_checker(guest.installer.bootconfig)
@@ -235,7 +235,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterCpuMode(self):
         infile  = "tests/xmlparse-xml/change-cpumode-in.xml"
         outfile = "tests/xmlparse-xml/change-cpumode-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         check = self._make_checker(guest.cpu)
@@ -252,7 +252,7 @@ class XMLParseTest(unittest.TestCase):
         """
         infile  = "tests/xmlparse-xml/change-disk-in.xml"
         outfile = "tests/xmlparse-xml/change-disk-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         # Set size up front. VirtualDisk validation is kind of
@@ -299,7 +299,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterChars(self):
         infile  = "tests/xmlparse-xml/change-chars-in.xml"
         outfile = "tests/xmlparse-xml/change-chars-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         serial1     = guest.get_devices("serial")[0]
@@ -358,7 +358,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterControllers(self):
         infile  = "tests/xmlparse-xml/change-controllers-in.xml"
         outfile = "tests/xmlparse-xml/change-controllers-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         dev1 = guest.get_devices("controller")[0]
@@ -393,7 +393,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterNics(self):
         infile  = "tests/xmlparse-xml/change-nics-in.xml"
         outfile = "tests/xmlparse-xml/change-nics-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         dev1 = guest.get_devices("interface")[0]
@@ -451,7 +451,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterInputs(self):
         infile  = "tests/xmlparse-xml/change-inputs-in.xml"
         outfile = "tests/xmlparse-xml/change-inputs-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         dev1 = guest.get_devices("input")[0]
@@ -471,7 +471,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterGraphics(self):
         infile  = "tests/xmlparse-xml/change-graphics-in.xml"
         outfile = "tests/xmlparse-xml/change-graphics-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         dev1 = guest.get_devices("graphics")[0]
@@ -515,7 +515,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterVideos(self):
         infile  = "tests/xmlparse-xml/change-videos-in.xml"
         outfile = "tests/xmlparse-xml/change-videos-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         dev1 = guest.get_devices("video")[0]
@@ -540,7 +540,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterHostdevs(self):
         infile  = "tests/xmlparse-xml/change-hostdevs-in.xml"
         outfile = "tests/xmlparse-xml/change-hostdevs-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         dev1 = guest.get_devices("hostdev")[0]
@@ -577,7 +577,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterWatchdogs(self):
         infile  = "tests/xmlparse-xml/change-watchdogs-in.xml"
         outfile = "tests/xmlparse-xml/change-watchdogs-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         dev1 = guest.get_devices("watchdog")[0]
@@ -591,7 +591,7 @@ class XMLParseTest(unittest.TestCase):
         devtype = "filesystem"
         infile  = "tests/xmlparse-xml/change-%ss-in.xml" % devtype
         outfile = "tests/xmlparse-xml/change-%ss-out.xml" % devtype
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         dev1 = guest.get_devices(devtype)[0]
@@ -632,7 +632,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterSounds(self):
         infile  = "tests/xmlparse-xml/change-sounds-in.xml"
         outfile = "tests/xmlparse-xml/change-sounds-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         dev1 = guest.get_devices("sound")[0]
@@ -653,7 +653,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterAddr(self):
         infile  = "tests/xmlparse-xml/change-addr-in.xml"
         outfile = "tests/xmlparse-xml/change-addr-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         dev1 = guest.get_devices("disk")[0]
@@ -691,7 +691,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterSmartCard(self):
         infile  = "tests/xmlparse-xml/change-smartcard-in.xml"
         outfile = "tests/xmlparse-xml/change-smartcard-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         dev1 = guest.get_devices("smartcard")[0]
@@ -709,7 +709,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterRedirdev(self):
         infile  = "tests/xmlparse-xml/change-redirdev-in.xml"
         outfile = "tests/xmlparse-xml/change-redirdev-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         dev1 = guest.get_devices("redirdev")[0]
@@ -727,7 +727,7 @@ class XMLParseTest(unittest.TestCase):
     def testAlterTPM(self):
         infile  = "tests/xmlparse-xml/change-tpm-in.xml"
         outfile = "tests/xmlparse-xml/change-tpm-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         dev1 = guest.get_devices("tpm")[0]
@@ -740,7 +740,7 @@ class XMLParseTest(unittest.TestCase):
     def testConsoleCompat(self):
         infile  = "tests/xmlparse-xml/console-compat-in.xml"
         outfile = "tests/xmlparse-xml/console-compat-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         dev1 = guest.get_devices("console")[0]
@@ -752,7 +752,7 @@ class XMLParseTest(unittest.TestCase):
     def testAddRemoveDevices(self):
         infile  = "tests/xmlparse-xml/add-devices-in.xml"
         outfile = "tests/xmlparse-xml/add-devices-out.xml"
-        guest = virtinst.Guest(conn=conn,
+        guest = virtinst.Guest(conn,
                                parsexml=file(infile).read())
 
         rmdev = guest.get_devices("disk")[2]
@@ -772,7 +772,7 @@ class XMLParseTest(unittest.TestCase):
     def testChangeKVMMedia(self):
         infile  = "tests/xmlparse-xml/change-media-in.xml"
         outfile = "tests/xmlparse-xml/change-media-out.xml"
-        guest = virtinst.Guest(conn=kvmconn,
+        guest = virtinst.Guest(kvmconn,
                                parsexml=file(infile).read())
 
         disk = guest.get_devices("disk")[0]

virtManager/create.py

@@ -1491,7 +1491,7 @@ class vmmCreate(vmmGObjectUI):
         name = self.get_config_name()
 
         try:
-            g = virtinst.Guest(conn=self.conn.vmm)
+            g = virtinst.Guest(self.conn.vmm)
             g.name = name
         except Exception, e:
             return self.err.val_err(_("Invalid System Name"), e)

virtManager/domain.py

@@ -409,7 +409,7 @@ class vmmDomain(vmmLibvirtObject):
         return self._guest
 
     def _build_guest(self, xml):
-        return virtinst.Guest(conn=self.conn.vmm,
+        return virtinst.Guest(self.conn.vmm,
                               parsexml=xml,
                               caps=self.conn.get_capabilities())
 

virtinst/CloneManager.py

@@ -70,7 +70,7 @@ class Cloner(object):
                               self.CLONE_POLICY_NO_EMPTYMEDIA]
 
         # Throwaway guest to use for easy validation
-        self._valid_guest = Guest(conn=conn)
+        self._valid_guest = Guest(conn)
 
         # Generate a random UUID at the start
         self.clone_uuid = util.generate_uuid(conn)
@@ -265,7 +265,7 @@ class Cloner(object):
 
         logging.debug("Original XML:\n%s", self.original_xml)
 
-        self._guest = Guest(conn=self.conn,
+        self._guest = Guest(self.conn,
                                   parsexml=self.original_xml)
         self._guest.replace = self.replace
 

virtinst/Guest.py

@@ -170,22 +170,11 @@ class Guest(XMLBuilderDomain.XMLBuilderDomain):
 
         return cpustr
 
-    def __init__(self, type=None, connection=None, hypervisorURI=None,
+    def __init__(self, conn, type=None,
-                 installer=None, parsexml=None, caps=None, conn=None):
+                 installer=None, parsexml=None, caps=None):
         # pylint: disable=W0622
         # Redefining built-in 'type', but it matches the XML so keep it
 
-        # Set up the connection, since it is fundamental for other init
-        conn = conn or connection
-        if conn is None:
-            logging.debug("No conn passed to Guest, opening URI '%s'",
-                          hypervisorURI)
-            conn = self._open_uri(hypervisorURI)
-
-        if conn is None:
-            raise RuntimeError(_("Unable to connect to hypervisor, aborting "
-                                 "installation!"))
-
         self._name = None
         self._uuid = None
         self._memory = None
@@ -256,10 +245,6 @@ class Guest(XMLBuilderDomain.XMLBuilderDomain):
         self._cpu = CPU(self.conn)
         self._numatune = DomainNumatune(self.conn)
 
-    def _open_uri(self, uri):
-        # This is here so test suite can overwrite it, to make sure
-        # Guest is never opening anything
-        return libvirt.open(uri)
 
     ######################
     # Property accessors #

virtinst/Installer.py

@@ -440,7 +440,7 @@ class Installer(XMLBuilderDomain.XMLBuilderDomain):
                                                         arch=self.arch,
                                                         machine=self.machine)
 
-        gobj = virtinst.Guest(installer=self, conn=self.conn)
+        gobj = virtinst.Guest(self.conn, installer=self)
         gobj.arch = guest.arch
         gobj.emulator = domain.emulator
         self.loader = domain.loader