Merge lp:~nuclearbob/utah/image-handling into lp:utah

[Max Brustkern]

This change moves image handling out of the Machine class. This is necessary for the upcoming LVM changes. This branch is based on:
https://code.launchpad.net/~nuclearbob/utah/install-type
I've tested it on a variety of VMs. I'm working on baremetal testing now, but I'd like to get some other eyes on it in the interim. Unlike my previous proposal, this doesn't drop Panda support.

[Andy Doan (doanac)]

nice start. I think _get_machine is still a bit too complex and can be broken up more. Here's a totally untested idea for inspiration:

 http://paste.ubuntu.com/5752180/

By doing that, you also open the door for being able to add some unit testing to each of the new functions. You might even be able to take this idea further and move the _get_physical_machine type function to /storage/doanac/code/utah/utah/provisioning/baremetal/__init__.py

[Max Brustkern (nuclearbob)]

I was actually planning to make similar changes to what you suggest in the LVM branch itself, since I'll be adding a new possibility (if skip provisioning AND image) that needs to be able to fall back on the provisioning functionality. I can try to do that separation and reorganization in this branch and just not add the LVM functionality yet.

[lp:~nuclearbob/utah/image-handling]

937. By Max Brustkern on 2013-06-11

Removing extra newline from media info and install type

944. By Max Brustkern on 2013-06-10

Removed superfluous boottimeout member of the Machine class

945. By Max Brustkern on 2013-06-10

Simplified command line setup

946. By Max Brustkern on 2013-06-11

Initial _get_machine refactoring for testing purposes

947. By Max Brustkern on 2013-06-11

Created get_vm in vm.py

948. By Max Brustkern on 2013-06-11

Added dosctring for get_vm

949. By Max Brustkern on 2013-06-11

Added get_baremetal function

[Max Brustkern (nuclearbob)]

I've done some testing on this. VMs work correctly. Bare metal doesn't, but the issue I'm having right now is with getting the UUID, so I can't confirm that this actual change is causing any problems.

I've refactored the code to get a machine a bit. get_vm and get_baremetal now reside in different files, and we attempt to import them in run_utah_tests and call them when appropriate. I think that will make it easier to plug in other types in the future.

I still have the image fetch before determining whether we're going to skip provisioning. That's a prelude to the LVM changes; for LVM support, if skip provisioning was passed, and an image was passed, we need to inspect the image to compare it to what's on the machine. If it doesn't match, we need to provision. To avoid downloading the image twice, we get the image first, but only if the user actually asked for one. That way, a normal skip provisioning case where no image is provided won't download one.

review: Needs Resubmitting

[Max Brustkern (nuclearbob)]

By setting all the steps in a config file I was able to get an install to complete on bare metal. Installing the client package is still failing, so I can look into that further, but I'm reasonably confident that these changes are not the source of that issue.

[Andy Doan (doanac)]

Looks pretty good. One thing I find a little awkward is the logic of this function:

def _get_machine(args):
    image = args.image
    if image and image.endswith('.iso'):
        image = ISO(image=args.image)
    if args.skip_provisioning:
        # TBD: Inventory should be used to verify machine
        # is not running other tests
        return ProvisionedMachine(name=args.name)
    return _get_unprovisioned_machine(args, image)

How about something like:

def _get_machine(args):
    if args.skip_provisioning:
        # TBD: Inventory should be used to verify machine
        # is not running other tests
        return ProvisionedMachine(name=args.name)

    image = args.image
    if image and image.endswith('.iso'):
        image = ISO(image=args.image)
    return _get_unprovisioned_machine(args, image)

[Max Brustkern (nuclearbob)]

I agree that getting an image before the ProvisionedMachine bit looks awkward, but for LVM, we need to have the image available so we can unpack it to get info from it, if and only if the user explicitly specified an image. If I don't do it now, I'm just going to do it in the next merge proposal.

[Andy Doan (doanac)]

On 06/11/2013 08:08 PM, Max Brustkern wrote:
> I agree that getting an image before the ProvisionedMachine bit looks awkward, but for LVM, we need to have the image available so we can unpack it to get info from it, if and only if the user explicitly specified an image. If I don't do it now, I'm just going to do it in the next merge proposal.

ah - okay. LGTM then

=== modified file 'client.py'
--- client.py	2013-06-03 16:27:13 +0000
+++ client.py	2013-06-11 05:51:28 +0000
@@ -32,6 +32,7 @@
 
 from utah.client.common import (
     DEFAULT_STATE_FILE,
+    get_install_type,
     ReturnCodes,
 )
 from utah.client.exceptions import UTAHClientError
@@ -61,7 +62,7 @@
                         default='/var/lib/utah', help='Main test directory')
     parser.add_argument('-i', '--install-type',
                         choices=['desktop', 'server', 'mini', 'alternate'],
-                        default='desktop',
+                        default=get_install_type(),
                         help=('Installation Variant '
                               '(i.e. server, desktop, etc.)'))
     parser.add_argument('-r', '--runlist', type=url_argument,

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-10 18:43:43 +0000
+++ debian/changelog	2013-06-11 05:51:28 +0000
@@ -32,6 +32,8 @@
   [ Max Brustkern ]
   * Added media-info to installation so it will work on non-desktop
     installs
+  * Updated installer and client to use /etc/utah/install-type
+  * Moved image handling out of the Machine class
 
  -- Max Brustkern <[e-mail]>  Fri, 17 May 2013 10:17:05 -0400
 

=== modified file 'examples/run_utah_tests.py'
--- examples/run_utah_tests.py	2013-05-30 09:29:41 +0000
+++ examples/run_utah_tests.py	2013-06-11 05:51:28 +0000
@@ -18,7 +18,6 @@
 """Provision a machine a run a test."""
 
 import logging
-import os
 import sys
 
 from traceback import format_exception
@@ -29,9 +28,9 @@
 from utah.config import config
 from utah.exceptions import UTAHException
 from utah.group import check_user_group, print_group_error_message
+from utah.iso import ISO
 from utah.parser import get_parser, parse_args  # NOQA
 from utah.provisioning.ssh import ProvisionedMachine
-from utah.provisioning.vm import TinySQLiteInventory
 from utah.run import (
     configure_logging,
     run_tests,
@@ -42,66 +41,56 @@
 
 MISSING = []
 try:
-    from utah.provisioning.baremetal.bamboofeeder import BambooFeederMachine
-except ImportError:
-    MISSING.append('bamboofeeder')
-try:
-    from utah.provisioning.baremetal.cobbler import CobblerMachine
-except ImportError:
-    MISSING.append('cobbler')
-try:
-    from utah.provisioning.baremetal.inventory import \
-        ManualBaremetalSQLiteInventory
+    from utah.provisioning.baremetal import get_baremetal
 except ImportError:
     MISSING.append('baremetal')
+try:
+    from utah.provisioning.vm import get_vm
+except ImportError:
+    MISSING.append('vm')
+
+
+def _get_unprovisioned_machine(args, image=None):
+    if image is None:
+        image = ISO(arch=args.arch, installtype=config.installtype,
+                    series=config.series)
+    kw = {'clean': (not args.no_destroy),
+          'boot': args.boot,
+          'debug': args.debug,
+          'image': image,
+          'initrd': args.initrd,
+          'kernel': args.kernel,
+          'name': args.name,
+          'new': True,
+          'preseed': args.preseed,
+          'rewrite': args.rewrite,
+          'xml': args.xml
+          }
+    if args.machinetype == 'physical':
+        if 'baremetal' in MISSING:
+            raise UTAHException(
+                'utah-baremetal package needed for physical machines')
+        return get_baremetal(args.arch, **kw)
+    else:
+        if 'vm' in MISSING:
+            raise UTAHException('Virtual Machine support is not available')
+        # TODO: consider removing these as explicit command line arguments
+        # and using config instead
+        kw['diskbus'] = args.diskbus
+        kw['emulator'] = args.emulator
+        kw['disksizes'] = args.gigabytes
+        return get_vm(**kw)
 
 
 def _get_machine(args):
+    image = args.image
+    if image and image.endswith('.iso'):
+        image = ISO(image=args.image)
     if args.skip_provisioning:
         # TBD: Inventory should be used to verify machine
         # is not running other tests
-        machine = ProvisionedMachine(name=args.name)
-    else:
-        kw = {'clean': (not args.no_destroy),
-              'new': True,
-              }
-        kw['arch'] = args.arch
-        kw['boot'] = args.boot
-        kw['debug'] = args.debug
-        kw['image'] = args.image
-        kw['initrd'] = args.initrd
-        kw['kernel'] = args.kernel
-        kw['name'] = args.name
-        kw['preseed'] = args.preseed
-        kw['rewrite'] = args.rewrite
-        kw['series'] = args.series
-        kw['xml'] = args.xml
-        kw['installtype'] = args.type
-        if args.machinetype == 'physical':
-            if 'baremetal' in MISSING:
-                raise UTAHException(
-                    'utah-baremetal package needed for physical machines')
-            if 'arm' in args.arch:
-                if 'bamboofeeder' in MISSING:
-                    raise UTAHException(
-                        'utah-bamboofeeder package needed for panda boards')
-                inventory = ManualBaremetalSQLiteInventory(
-                    db=os.path.join('~', '.utah-bamboofeeder-inventory'),
-                    lockfile=os.path.join('~', '.utah-bamboofeeder-lock'))
-                kw['machinetype'] = BambooFeederMachine
-            else:
-                if 'cobbler' in MISSING:
-                    raise UTAHException(
-                        'utah-cobbler package needed for this machine type')
-                inventory = ManualBaremetalSQLiteInventory()
-                kw['machinetype'] = CobblerMachine
-        else:
-            inventory = TinySQLiteInventory()
-            kw['diskbus'] = args.diskbus
-            kw['emulator'] = args.emulator
-            kw['disksizes'] = args.gigabytes
-        machine = inventory.request(**kw)
-    return machine
+        return ProvisionedMachine(name=args.name)
+    return _get_unprovisioned_machine(args, image)
 
 
 def run_utah_tests(argv=None):

=== modified file 'templates/utah-latecommand.jinja2'
--- templates/utah-latecommand.jinja2	2013-06-06 03:09:49 +0000
+++ templates/utah-latecommand.jinja2	2013-06-11 05:51:28 +0000
@@ -28,6 +28,7 @@
     echo "{{uuid}}" > /target/etc/utah/uuid
     echo "{{user}}" >> /target/etc/utah/users
     echo "{{media_info}}" > /target/etc/utah/media-info
+    echo "{{install_type}}" > /target/etc/utah/install-type
 }
 
 copy_rsyslog_cfg() {

=== modified file 'utah/client/common.py'
--- utah/client/common.py	2013-06-10 18:43:43 +0000
+++ utah/client/common.py	2013-06-11 05:51:28 +0000
@@ -56,6 +56,7 @@
 DEFAULT_STATE_FILE = os.path.join(UTAH_DIR, "state.yaml")
 
 MEDIA_INFO = '/etc/utah/media-info'
+INSTALL_TYPE = '/etc/utah/install-type'
 PRODUCT_UUID = '/sys/class/dmi/id/product_uuid'
 
 
@@ -392,7 +393,7 @@
 
     try:
         with open(MEDIA_INFO, 'r') as f:
-            media_info = f.read()
+            media_info = f.read().strip()
     except IOError:
         # If this fails, return the default
         pass
@@ -400,6 +401,32 @@
     return media_info
 
 
+def get_install_type():
+    """Get the contents of the install-type file if available.
+
+    :returns:
+        The contents of the install-type file or ``'unknown'`` if not
+        available.
+    :rtype: str
+
+    .. note:: This is only a best-effort approach.
+
+    .. seealso:: :func:`get_media_info`
+
+    """
+
+    install_type = 'unknown'
+
+    try:
+        with open(INSTALL_TYPE, 'r') as f:
+            install_type = f.read().strip()
+    except IOError:
+        # If this fails, return the default
+        pass
+
+    return install_type
+
+
 def get_product_uuid():
     """Get the product_uuid of the machine under test.
 

=== modified file 'utah/iso.py'
--- utah/iso.py	2013-05-24 14:29:23 +0000
+++ utah/iso.py	2013-06-11 05:51:28 +0000
@@ -57,16 +57,8 @@
 
     """Provide a simplified method of interfacing with images."""
 
-    def __init__(self, arch=None, dlpercentincrement=None, dlretries=None,
-                 image=None, installtype=None, logger=None, series=None):
-        if dlpercentincrement is None:
-            self.dlpercentincrement = config.dlpercentincrement
-        else:
-            self.dlpercentincrement = dlpercentincrement
-        if dlretries is None:
-            self.dlretries = config.dlretries
-        else:
-            self.dlretries = dlretries
+    def __init__(self, arch=None, image=None, installtype=None, logger=None,
+                 series=None):
         if logger is None:
             self._loggersetup()
         else:
@@ -206,7 +198,7 @@
         percent = 100 * read / total
         if percent >= self.percent:
             self.logger.info('File %s%% downloaded', percent)
-            self.percent += self.dlpercentincrement
+            self.percent += config.dlpercentincrement
         self.logger.debug('%s read, %s%% of %s total', read, percent, total)
 
     def listfiles(self, returnlist=False):

=== modified file 'utah/provisioning/baremetal/__init__.py'
--- utah/provisioning/baremetal/__init__.py	2013-04-04 13:42:40 +0000
+++ utah/provisioning/baremetal/__init__.py	2013-06-11 05:51:28 +0000
@@ -14,3 +14,51 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """utah.provisioning.baremetal"""
+
+
+import os
+
+from utah.exceptions import UTAHException
+from utah.provisioning.baremetal.inventory import (
+    ManualBaremetalSQLiteInventory
+)
+
+
+MISSING = []
+try:
+    from utah.provisioning.baremetal.bamboofeeder import BambooFeederMachine
+except ImportError:
+    MISSING.append('bamboofeeder')
+try:
+    from utah.provisioning.baremetal.cobbler import CobblerMachine
+except ImportError:
+    MISSING.append('cobbler')
+
+
+def get_baremetal(arch, **kw):
+    """Return a Machine object with the passed in arch and arguments.
+
+    :param arch: Architecture of machine (mainly used for ARM or not ARM)
+    :type arch: str
+    :param kw: All other parameters are passed to the Machine constructor
+    :type kw: dict
+
+    :returns: Appropriately constructed Machine object
+    :rtype: object
+
+    """
+    if 'arm' in arch:
+        if 'bamboofeeder' in MISSING:
+            raise UTAHException(
+                'utah-bamboofeeder package needed for panda boards')
+        inventory = ManualBaremetalSQLiteInventory(
+            db=os.path.join('~', '.utah-bamboofeeder-inventory'),
+            lockfile=os.path.join('~', '.utah-bamboofeeder-lock'))
+        kw['machinetype'] = BambooFeederMachine
+    else:
+        if 'cobbler' in MISSING:
+            raise UTAHException(
+                'utah-cobbler package needed for this machine type')
+        inventory = ManualBaremetalSQLiteInventory()
+        kw['machinetype'] = CobblerMachine
+    return inventory.request(**kw)

=== modified file 'utah/provisioning/baremetal/bamboofeeder.py'
--- utah/provisioning/baremetal/bamboofeeder.py	2013-05-24 14:29:23 +0000
+++ utah/provisioning/baremetal/bamboofeeder.py	2013-06-11 05:51:28 +0000
@@ -259,15 +259,6 @@
             provision_data.update_initrd(initrd_dir)
 
         self._setuplatecommand()
-        # TODO: check if this is still needed
-        if self.installtype == 'desktop':
-            self.logger.info('Configuring latecommand for desktop')
-            myfile = open(os.path.join(self.tmpdir, 'initrd.d',
-                          'utah-latecommand'), 'a')
-            myfile.write("""
-chroot /target sh -c 'sed "/eth[0-9]/d" -i /etc/network/interfaces'
-""")
-            myfile.close()
         self._setuppreseed()
         self.logger.debug('Copying preseed to download location')
         preseedfile = os.path.join(config.wwwdir, '{}.cfg'.format(self.name))

=== modified file 'utah/provisioning/baremetal/cobbler.py'
--- utah/provisioning/baremetal/cobbler.py	2013-05-24 14:29:23 +0000
+++ utah/provisioning/baremetal/cobbler.py	2013-06-11 05:51:28 +0000
@@ -57,21 +57,21 @@
         if self.image is None:
             raise UTAHBMProvisioningException(
                 'Image file required for cobbler installation')
-        self._custominit()
+        self._cmdlinesetup()
         self._depcheck()
 
         self.isodir = None
 
         # TODO: Rework cinitrd to be less of a confusing collection of kludges
         self.cinitrd = None
-        if self.installtype in ['alternate', 'server']:
+        if self.image.installtype in ['alternate', 'server']:
             self.cinitrd = os.path.join('install', 'netboot',
-                                        'ubuntu-installer', self.arch,
+                                        'ubuntu-installer', self.image.arch,
                                         'initrd.gz')
-        if self.arch == 'amd64':
+        if self.image.arch == 'amd64':
             self.carch = 'x86_64'
         else:
-            self.carch = self.arch
+            self.carch = self.image.arch
         self.cname = '-'.join([self.name, self.carch])
         self.logger.debug('Cobbler arch is %s', self.carch)
         self.logger.debug('Cobbler machine init finished')
@@ -89,7 +89,7 @@
         self.cleanfile(self.tmpdir)
         os.chmod(self.tmpdir, 0775)
 
-        if self.installtype in ['alternate', 'desktop', 'server']:
+        if self.image.installtype in ['alternate', 'desktop', 'server']:
             self.logger.info('Mounting image')
             self.isodir = os.path.join(self.tmpdir, 'iso.d')
             self.cleanfunction(self._removenfs)
@@ -118,7 +118,7 @@
 
         self._setuplatecommand()
         # TODO: see if this is needed for all quantal desktops
-        if self.installtype == 'desktop':
+        if self.image.installtype == 'desktop':
             self.logger.info('Configuring latecommand for desktop')
             myfile = open(os.path.join(self.tmpdir, 'initrd.d',
                           'utah-latecommand'), 'a')
@@ -141,7 +141,7 @@
 
         preseed = os.path.join(self.tmpdir, 'initrd.d', 'preseed.cfg')
 
-        if self.installtype in ['alternate', 'server']:
+        if self.image.installtype in ['alternate', 'server']:
             self.logger.info('Importing image')
             self._cobble(['import',
                           '--name={}'.format(self.cname),
@@ -151,7 +151,7 @@
                           '--name={}'.format(self.cname),
                           '--kernel={}'.format(kernel),
                           '--initrd={}'.format(initrd)])
-        elif self.installtype in ['mini', 'desktop']:
+        elif self.image.installtype in ['mini', 'desktop']:
             self.logger.info('Creating distro')
             self._cobble(['distro', 'add',
                           '--name={}'.format(self.cname),
@@ -162,7 +162,7 @@
                           '--name={}'.format(self.cname),
                           '--distro={}'.format(self.cname)])
 
-        if self.installtype == 'desktop':
+        if self.image.installtype == 'desktop':
             self.logger.info('Setting up NFS for desktop install')
             self.logger.debug('Adding export to NFS config file')
             pipe = pipes.Template()
@@ -216,7 +216,7 @@
         retry(self.sshcheck, logmethod=self.logger.info,
               retry_timeout=config.checktimeout)
 
-        if self.installtype == 'desktop':
+        if self.image.installtype == 'desktop':
             self._removenfs()
 
         self.active = True
@@ -318,11 +318,11 @@
     def _depcheck(self):
         """Check for NFS if installtype requires it."""
         super(CobblerMachine, self)._depcheck()
-        if self.installtype in ['alternate', 'desktop', 'server']:
+        if self.image.installtype in ['alternate', 'desktop', 'server']:
             cmd = config.nfscommand + ['status']
             if ProcessRunner(cmd).returncode != 0:
                 raise UTAHBMProvisioningException(
-                    'NFS needed for {} install'.format(self.installtype))
+                    'NFS needed for {} install'.format(self.image.installtype))
             if not os.path.isfile(config.nfsconfigfile):
                 raise UTAHBMProvisioningException(
                     'NFS config file: {nfsconfigfile} not available'

=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py	2013-06-06 03:09:49 +0000
+++ utah/provisioning/provisioning.py	2013-06-11 05:51:28 +0000
@@ -64,22 +64,17 @@
 
     """
 
-    def __init__(self, arch=config.arch, boot=config.boot, clean=True,
-                 debug=False, image=config.image,
-                 dlpercentincrement=config.dlpercentincrement,
-                 initrd=config.initrd, installtype=config.installtype,
-                 inventory=None, kernel=config.kernel,
-                 machineid=config.machineid, machineuuid=config.machineuuid,
-                 name=config.name, new=False, preseed=config.preseed,
-                 rewrite=config.rewrite, series=config.series,
+    def __init__(self, boot=config.boot, clean=True, debug=False,
+                 image=None, initrd=config.initrd, inventory=None,
+                 kernel=config.kernel, machineid=config.machineid,
+                 machineuuid=config.machineuuid, name=config.name, new=False,
+                 preseed=config.preseed, rewrite=config.rewrite,
                  template=config.template, xml=config.xml):
         """Initialize the object representing the machine.
 
         One of these groups of arguments should be included:
-            series, installtype, arch: Download an ISO from the mirrors and use
-                it to install the machine.
             image, kernel, initrd, preseed: Install the machine from a
-                specified image/ISO file, with an optional kernel, initrd, and
+                specified image object, with an optional kernel, initrd, and
                 preseed.  libvirt xml file can be passed in xml as well.
             template: Clone the machine from a template or existing machine.
             name: Request a specific machine.  Combine with other groups to
@@ -88,8 +83,6 @@
         Other arguments:
             clean: Enable cleanup functions.
             debug: Enable debug logging.
-            dlpercentincrement: How often to log download updates to INFO
-                (All updates logged to DEBUG)
             inventory: Inventory object managing the machine; used for cleanup
                 purposes.
             machineid: Should be passed by the request method of an Inventory
@@ -116,24 +109,17 @@
         """
         # TODO: Make this work right with super at some point.
         # TODO: Consider a global temp file creator, maybe as part of install.
-        # TODO: Make everything use config.dlpercentincrement instead of
-        # passing it around all the time
-        self.arch = arch
         self.boot = boot
         self.clean = clean
         self.debug = debug
-        self.dlpercentincrement = dlpercentincrement
-        self.installtype = installtype
+        self.image = image
         self.inventory = inventory
         self.machineid = machineid
         self.new = new
         self.rewrite = rewrite
-        self.series = series
         self.template = template
         self.uuid = uuid
 
-        self.boottimeout = config.boottimeout
-
         # TODO: Move namesetup into vm
         self._namesetup(name)
 
@@ -148,19 +134,8 @@
 
         fileargs = ['initrd', 'kernel', 'preseed', 'xml']
 
-        if image is None:
-            self.image = ISO(arch=arch,
-                             dlpercentincrement=dlpercentincrement,
-                             installtype=installtype,
-                             logger=self.logger,
-                             series=series)
-        elif image.endswith('.iso'):
-            self.image = ISO(dlpercentincrement=dlpercentincrement,
-                             image=image,
-                             logger=self.logger)
-        else:
-            fileargs.append('image')
-
+        # TODO: make this a function that lives somewhere else:
+        # TODO: maybe move this preparation out of this class
         for item in fileargs:
             # Ensure every file/url type argument is available locally
             arg = locals()[item]
@@ -210,44 +185,32 @@
         else:
             self.name = name
 
-    def _makename(self, arch=None, installtype=None, machineid=None,
-                  prefix=None, series=None):
+    def _makename(self, machineid=None, prefix=None):
         """Return a name for the machine based on how it will be installed.
 
         Generally used for VMs to comply with old vm-tools naming conventions.
         Probably could be reduced or removed.
 
-        :param arch: Architecture of the machine
-        :type arch: str
-        :param installtype: Image type (desktop, server, mini, alternate)
-        :type installtype: str
         :param machineid: Unique numerical machine identifier
         :type machineid: int
         :param prefix: Prefix for machine name (defaults to utah)
         :type prefix: str
-        :param series: Release codename (i.e. precise, quantal, raring)
-        :type series: str
         :returns: Generated machine name, like utah-1-precise-i386
         :rtype: str
 
         """
-        if arch is None:
-            arch = str(self.arch)
-        if installtype is None:
-            installtype = str(self.installtype)
         if machineid is None:
             machineid = str(self.machineid)
         if prefix is None:
             prefix = str(self.prefix)
-        if series is None:
-            series = str(self.series)
         if machineid is not None:
             prefix += ('-{}'.format(str(machineid)))
         self.prefix = prefix
-        if installtype == 'desktop':
-            name = '-'.join([prefix, series, arch])
+        if self.image.installtype == 'desktop':
+            name = '-'.join([prefix, self.image.series, self.image.arch])
         else:
-            name = '-'.join([prefix, series, installtype, arch])
+            name = '-'.join([prefix, self.image.series,
+                             self.image.installtype, self.image.arch])
         return name
 
     def _loggersetup(self):
@@ -330,7 +293,7 @@
 
         """
         if timeout is None:
-            timeout = self.boottimeout
+            timeout = config.boottimeout
         if logmethod is None:
             logmethod = self.logger.debug
         utah.timeout.timeout(timeout, retry, self.pingcheck,
@@ -518,7 +481,7 @@
         percent = 100 * read / total
         if percent >= self.percent:
             self.logger.info('File %s%% downloaded', percent)
-            self.percent += self.dlpercentincrement
+            self.percent += config.dlpercentincrement
         self.logger.debug('%s read, %s%% of %s total', read, percent, total)
 
     def _depcheck(self):
@@ -658,10 +621,10 @@
         if initrd is None:
             self.logger.info('Unpacking initrd from image')
             initrdpath = './install/initrd.gz'
-            if self.installtype == 'mini':
+            if self.image.installtype == 'mini':
                 self.logger.debug('Mini image detected')
                 initrdpath = 'initrd.gz'
-            elif self.installtype == 'desktop':
+            elif self.image.installtype == 'desktop':
                 self.logger.debug('Desktop image detected')
                 # TODO: scan for this like desktop
                 initrdpath = './casper/initrd.lz'
@@ -726,7 +689,8 @@
                        user=config.user,
                        uuid=self.uuid,
                        log_file='/target/var/log/utah-install',
-                       media_info=self.image.media_info)
+                       media_info=self.image.media_info,
+                       install_type=self.image.installtype)
 
         filename = os.path.join(tmpdir, 'initrd.d', 'utah-setup')
         template.write('utah-setup.jinja2',
@@ -758,7 +722,7 @@
                 if 'passwd/username' in preseed:
                     self._rewrite_passwd_username(preseed)
 
-            if self.installtype == 'desktop':
+            if self.image.installtype == 'desktop':
                 self._rewrite_failure_command(preseed)
 
             output_preseed_filename = os.path.join(tmpdir,
@@ -770,7 +734,7 @@
             self.logger.info('Not altering preseed because rewrite is %s',
                              self.rewrite)
 
-        if (self.installtype == 'desktop' and
+        if (self.image.installtype == 'desktop' and
                 self.rewrite in ['all', 'minimal', 'casperonly']):
             self._preseedcasper(tmpdir=tmpdir)
 
@@ -782,7 +746,7 @@
         question = preseed['preseed/late_command']
 
         log_file = '/var/log/utah-install'
-        if self.installtype == 'desktop':
+        if self.image.installtype == 'desktop':
             self.logger.info('Changing d-i latecommand '
                              'to ubiquity success_command '
                              'and prepending ubiquity lines')
@@ -939,7 +903,7 @@
         pipe.append('cpio --quiet -o -H newc', '--')
         # Desktop image loads initrd.gz,
         # but for physical machines we should stick with lz
-        if self.installtype == 'desktop':
+        if self.image.installtype == 'desktop':
             self.logger.debug('Using lzma because installtype is desktop')
             pipe.append('lzma -9fc ', '--')
             initrd = os.path.join(tmpdir, 'initrd.lz')
@@ -951,7 +915,7 @@
             raise UTAHProvisioningException('Failed to repack initrd')
         return initrd
 
-    def _cmdlinesetup(self, boot=None):
+    def _cmdlinesetup(self):
         """Setup the command line for an unattended install.
 
         If any options known to be needed for an automated install are not
@@ -963,11 +927,7 @@
         """
         # TODO: update libvirtvm to work like the hardware provisioners
         # or vice versa
-        if boot is None:
-            boot = self.boot
-        if boot is None:
-            boot = ''
-        self.cmdline = boot
+        self.cmdline = self.boot or ''
         # TODO: Refactor this into lists like BambooFeederMachine
         if self.rewrite == 'all':
             self.logger.info('Adding needed command line options')
@@ -977,7 +937,7 @@
                 ('log_host', self._ipaddr(config.bridge)),
                 ('log_port', str(self.rsyslog.port)),
             ]
-            if self.installtype == 'desktop':
+            if self.image.installtype == 'desktop':
                 options.extend([
                     'automatic-ubiquity',
                     'noprompt',
@@ -1008,18 +968,6 @@
                              self.rewrite)
         self.logger.info('Boot command line is: {}'.format(self.cmdline))
 
-    def _custominit(self, arch=None, boot=None, installtype=None, series=None):
-        """Setup installtype, arch, series and commandline."""
-        #TODO: Make this a proper __init__ method
-        #by adding super call to Machine.
-        if installtype is None:
-            self.installtype = self.image.installtype
-        if arch is None:
-            self.arch = self.image.arch
-        if series is None:
-            self.series = self.image.series
-        self._cmdlinesetup(boot=boot)
-
     @staticmethod
     def _ipaddr(ifname):
         """Return the first IP address found for the given interface name.

=== modified file 'utah/provisioning/ssh.py'
--- utah/provisioning/ssh.py	2013-05-24 14:29:23 +0000
+++ utah/provisioning/ssh.py	2013-06-11 05:51:28 +0000
@@ -319,7 +319,7 @@
         finally:
             self.ssh_client.close()
 
-    def sshpoll(self, timeout=None,
+    def sshpoll(self, timeout=config.boottimeout,
                 checktimeout=config.checktimeout, logmethod=None):
         """Run sshcheck over and over until timeout expires.
 
@@ -331,8 +331,6 @@
         :type logmethod: function
 
         """
-        if timeout is None:
-            timeout = self.boottimeout
         if logmethod is None:
             logmethod = self.ssh_logger.debug
         utah.timeout.timeout(timeout, retry, self.sshcheck,
@@ -351,7 +349,7 @@
 
     """A machine that is provisioned and can be accessed through ssh."""
 
-    def __init__(self, name, installtype=None):
+    def __init__(self, name):
         SSHMixin.initialize(self)
         self.name = name
         self._loggersetup()
@@ -367,15 +365,11 @@
         self.check_timeout = 3
         self.connectivity_timeout = 60
 
-        # TBD: Figure out install type by getting information through ssh
-        if installtype is None:
-            self.installtype = config.installtype
-
     def activecheck(self):
         """Check if machine is active.
 
         Given that the machine is already provisioned, it's considered to be
-        active as long as it's reachable through ssh
+        active as long as it's reachable through ssh.
 
         """
         if not self.active:

=== modified file 'utah/provisioning/vm.py'
--- utah/provisioning/vm.py	2013-05-24 14:29:23 +0000
+++ utah/provisioning/vm.py	2013-06-11 05:51:28 +0000
@@ -176,7 +176,7 @@
         if self.image is None:
             raise UTAHVMProvisioningException(
                 'Image file required for VM installation')
-        self._custominit()
+        self._cmdlinesetup()
         if autoname:
             self._namesetup()
             self._loggerunsetup()
@@ -304,12 +304,12 @@
             'Setting type to qemu in case no hardware virtualization present')
         xmlt.getroot().set('type', self.emulator)
         ose = xmlt.find('os')
-        if self.arch == ('i386'):
+        if self.image.arch == ('i386'):
             ose.find('type').set('arch', 'i686')
-        elif self.arch == ('amd64'):
+        elif self.image.arch == ('amd64'):
             ose.find('type').set('arch', 'x86_64')
         else:
-            ose.find('type').set('arch', self.arch)
+            ose.find('type').set('arch', self.image.arch)
         self.logger.debug('Setting up boot info')
         for kernele in list(ose.iterfind('kernel')):
             ose.remove(kernele)
@@ -553,13 +553,13 @@
         self.rsyslog.wait_for_booted(config.boot_steps, self.uuid)
         try:
             self.logger.info(
-                'Waiting %d seconds for ping response', self.boottimeout)
-            self.pingpoll(timeout=self.boottimeout)
+                'Waiting %d seconds for ping response', config.boottimeout)
+            self.pingpoll(timeout=config.boottimeout)
         except UTAHTimeout:
             # Ignore timeout for ping, since depending on the network
             # configuration ssh might still work despite of the ping failure.
             self.logger.warning('Network connectivity (ping) failure')
-        self.sshpoll(timeout=self.boottimeout)
+        self.sshpoll(timeout=config.boottimeout)
         self.active = True
 
 
@@ -614,3 +614,17 @@
         self.execute(
             "UPDATE machines SET state='destroyed' ""WHERE machineid=?",
             [machineid])
+
+
+def get_vm(**kw):
+    """Return a Machine object for a VM with the passed in arguments.
+
+    :param kw: All parameters are passed to the Machine constructor
+    :type kw: dict
+
+    :returns: Appropriately constructed Machine object
+    :rtype: object
+
+    """
+    inventory = TinySQLiteInventory()
+    return inventory.request(**kw)

=== modified file 'utah/run.py'
--- utah/run.py	2013-05-24 14:29:23 +0000
+++ utah/run.py	2013-06-11 05:51:28 +0000
@@ -329,8 +329,7 @@
     # Write the machine name to standard out for log gathering
     print('Running on machine: {}'.format(machine.name))
 
-    extraopts = ('-f {} --install-type {}'
-                 .format(args.report_type, machine.installtype))
+    extraopts = '-f {}'.format(args.report_type)
 
     locallogs = []