guest: Remove needless functions

And simplify some test infrastructure as a result

tests/image.py

@@ -93,7 +93,7 @@ class TestImageParser(unittest.TestCase):
 
 
             g.installer = inst
-            g._prepare_install(None)
+            ignore, actual_out = g.start_install(return_xml=True, dry=True)
 
             actual_out = g.get_install_xml(install=False)
             expect_file = os.path.join(image2guestdir + fname)

tests/xmlconfig.py

@@ -65,17 +65,23 @@ class TestXMLConfig(unittest.TestCase):
                  do_create=True):
         filename = filebase and build_xmlfile(filebase) or None
 
-        guest._prepare_install(None)
-        try:
-            actualXML = guest.get_install_xml(install=do_install,
-                                              disk_boot=do_disk_boot)
+        cont_xml = None
+        inst_xml, boot_xml = guest.start_install(return_xml=True, dry=True)
+        if do_disk_boot:
+            cont_xml, boot_xml = guest.continue_install(return_xml=True,
+                                                        dry=True)
 
-            if filename:
-                utils.diff_compare(actualXML, filename)
-            if do_create:
-                utils.test_create(guest.conn, actualXML)
-        finally:
-            guest._cleanup_install()
+        if do_disk_boot:
+            actualXML = cont_xml
+        elif do_install:
+            actualXML = inst_xml
+        else:
+            actualXML = boot_xml
+
+        if filename:
+            utils.diff_compare(actualXML, filename)
+        if do_create:
+            utils.test_create(guest.conn, actualXML)
 
     def _testInstall(self, guest,
                      instxml=None, bootxml=None, contxml=None):

virtinst/guest.py

@@ -237,6 +237,7 @@ class Guest(XMLBuilder):
         for devtype in VirtualDevice.virtual_device_types:
             retlist.extend(self.get_devices(devtype))
         return retlist
+    all_devices = property(lambda s: s.get_all_devices())
 
     def remove_device(self, dev):
         """
@@ -314,18 +315,6 @@ class Guest(XMLBuilder):
             self.add_device(dev)
             self._install_devices.append(dev)
 
-    def _cleanup_install(self):
-        self.installer.cleanup()
-
-    def _create_devices(self, progresscb):
-        """
-        Ensure that devices are setup
-        """
-        for dev in self.get_all_devices():
-            dev.setup(progresscb)
-
-    all_devices = property(lambda s: s.get_all_devices())
-
 
     ##############
     # Public API #
@@ -428,7 +417,8 @@ class Guest(XMLBuilder):
         try:
             # Create devices if required (disk images, etc.)
             if not dry:
-                self._create_devices(meter)
+                for dev in self.get_all_devices():
+                    dev.setup(meter)
 
             start_xml, final_xml = self._build_xml(is_initial)
             if return_xml:
@@ -448,7 +438,7 @@ class Guest(XMLBuilder):
 
             return self.domain
         finally:
-            self._cleanup_install()
+            self.installer.cleanup()
 
     def continue_install(self, meter=None,
                          dry=False, return_xml=False):