Merge lp:~nuclearbob/utah/consolidate-scripts into lp:utah

[Max Brustkern]

This branch removes the scripts other than run_utah_tests.py and consolidates their functionality into run_utah_tests.py

I tried to minimize changes to the actual functionality here. I think we should work on testing and landing lp:~doanac/utah/run-cleanups and then look into improving the integration between the two, cleaning things up, moving things around, reworking input methods, etc.

[Javier Collado (javier.collado)]

Documentation needs to be updated. In particular, the part in
`docs/source/conf.py` that takes care of the manpage generation of the scripts
that are now gone.

Aside from that, I think it would be a good idea to refactor the code in the
big if/elif/else to still have a function for each different provisioning case.

review: Needs Fixing

[Andy Doan (doanac)]

should we keep the original scripts and just print an error, so people don't think dpkg failed or something?

[Andy Doan (doanac)]

i agree about breaking out the if/else stuff.

Also it might be worth using context managers for the machine/inventory API's now that its in one spot. It could get rid of the destroy/del stuff?

[lp:~nuclearbob/utah/consolidate-scripts]

872. By Javier Collado on 2013-04-22

Merged changes to verify UTAHTimeout exceptions in rsyslog module

Source branch: lp:~javier.collado/utah/bug1169846-test-case

[Max Brustkern (nuclearbob)]

I'd like to see different provisioning methods, whether those are functions or not, that basically only consist of getting the inventory and machine objects. Everything else I'd like to see handled the same way, either in run_utah_test.py or run.py. I'll work on cleaning up the documentation, and I think if we can land this proposal:
https://code.launchpad.net/~doanac/utah/run-cleanups/+merge/159879
That'll put me in better shape to make the changes we've talked about in this branch.

[Max Brustkern (nuclearbob)]

The documentation should be updated now. I'm pondering the best place for machine getting functions. Right now, each machine type only works with a single inventory type. Would it make sense to provide functions at the level of a Machine subclass or at an Inventory level that would parse some arguments and request a machine? Or maybe we should be pulling the Machine-specific stuff out of args to pass that in? I'm not sure.

[lp:~nuclearbob/utah/consolidate-scripts]

873. By Javier Collado on 2013-04-24

Merged chnages to cleanup server code

Source branch: lp:~doanac/utah/server-cleanups

874. By Javier Collado on 2013-04-24

Merged changes to cleanup utah.run code

Source branch: lp:~doanac/utah/run-cleanups

[Javier Collado (javier.collado)]

There still a few .rst files under docs/source/man that should be removed.

If you try to build the documentation you'll see some error messages because
those .rst files include the .txt file that was generated from the script help
output to generate the man page.

Regarding what should be the way to get a machine, I think a function or a
class method in the inventory module would be a good fit with how the code
works now.

review: Needs Fixing

[lp:~nuclearbob/utah/consolidate-scripts]

875. By Max Brustkern on 2013-04-24

Merged reduced exception catching

876. By Andy Doan on 2013-04-25

uuid_check requires ssh so "self.provisioned" must be True

This call was moved into provisioning.py where its a litle
easier to manage it in conjunction with the state the machine
is in. This now means vm's will do the check as well, but that
should be harmless.

877. By Javier Collado on 2013-04-26

Merged changes to fix help output to use just one runlist (LP: #1112597)

Source branch: lp:~nuclearbob/utah/bug1112597

878. By Javier Collado on 2013-04-30

Merged changes to fix DefaultValidator and updated schemas to draftv4 (LP: #1165175)

Source branch: lp:~javier.collado/utah/bug1165175

879. By Javier Collado on 2013-04-30

Merged changes to refactor cleanup for the machine class

Source branch: lp:~nuclearbob/utah/cleanup-cleanup

882. By Max Brustkern on 2013-04-23

Removed other scripts from documentation configuration

883. By Max Brustkern on 2013-04-24

Removed old rst files

884. By Max Brustkern on 2013-04-24

Fixed permissions after rebasing

885. By Max Brustkern on 2013-04-24

Cleaned up argument handling for machine object stuff

886. By Max Brustkern on 2013-04-24

Removed old destruction handler

887. By Max Brustkern on 2013-04-24

Simplified main function

888. By Max Brustkern on 2013-04-24

Moved command line handling back into the script since it's just one script now

889. By Max Brustkern on 2013-04-24

Fixed pep257 warning

890. By Max Brustkern on 2013-04-24

Added TODO

891. By Max Brustkern on 2013-04-24

Changed to activecheck for compatibility with potential future non-ssh Machines

892. By Max Brustkern on 2013-04-24

Changed preseed copier to check for finalpreseed attribute instead of machine type. This should improve compatibility with future machine types.

893. By Max Brustkern on 2013-04-24

Cleaned up try block behavior now that cleanup works differently

894. By Max Brustkern on 2013-04-24

Fixed pep8 warning

895. By Max Brustkern on 2013-04-24

Cleaned up run_utah_tests function a bit

896. By Max Brustkern on 2013-04-24

Using standard config interface for dlpercentincrement and making the value we always use anyway into the default

897. By Max Brustkern on 2013-04-24

Alphabetized imports

898. By Max Brustkern on 2013-04-24

Fixed LP#1130901

899. By Max Brustkern on 2013-04-24

Updated changelog

900. By Max Brustkern on 2013-04-25

Added selectable arm arch

901. By Max Brustkern on 2013-04-25

Request->request

902. By Max Brustkern on 2013-04-25

Correctly named disksizes parameter

903. By Max Brustkern on 2013-04-25

Fixed dlpercentincrement setting

904. By Max Brustkern on 2013-04-25

Only VMs are automatically named, so only they need a prefix

905. By Max Brustkern on 2013-04-25

Overhauled handling of default args and config values, and added a config for power, which fixes LP #1153735

906. By Max Brustkern on 2013-04-26

Alphabetized config options

907. By Max Brustkern on 2013-04-26

Simplified outdir setting

908. By Max Brustkern on 2013-04-26

Set argument defaults from config

909. By Max Brustkern on 2013-04-26

Removed unneeded default sets

910. By Max Brustkern on 2013-04-26

Persistent directory is only used by VMs and wasn't even being used in the main constructor

911. By Max Brustkern on 2013-04-26

Updated default setting in Machine classes

912. By Max Brustkern on 2013-04-26

Made jobtimeout a default config option

913. By Max Brustkern on 2013-04-26

Made get machine function

914. By Max Brustkern on 2013-04-26

Implemented explicit argument stuff because everybody else thinks it's great :p

915. By Max Brustkern on 2013-04-30

Fixed typo

916. By Max Brustkern on 2013-04-30

Fixed changelog

917. By Max Brustkern on 2013-04-30

Removed extra man pages

918. By Max Brustkern on 2013-05-01

Moved cleanup before exception handling

919. By Max Brustkern on 2013-05-01

Updated help strings

920. By Max Brustkern on 2013-05-01

Fixed image handling typos

921. By Max Brustkern on 2013-05-01

Fixed machineid not being set

922. By Max Brustkern on 2013-05-01

Fixed failure to chmod preseed when it doesn't exist, and fixed self tests

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-19 19:08:00 +0000
+++ debian/changelog	2013-04-25 15:05:30 +0000
@@ -12,8 +12,12 @@
   * Added syslog output (including real time test output) to client
   * Make rsyslog timeout error message clearer (LP: #1169846)
   * Write to log UTAH version as soon as possible (LP: #1152216)
+  * Combined current provisioning functions into one script and removed
+    old scripts
+  * Fixed LP #1130901
+  * Fixed LP #1153735
 
- -- Max Brustkern <[e-mail]>  Tue, 16 Apr 2013 09:21:19 -0400
+ -- Max Brustkern <[e-mail]>  Thu, 25 Apr 2013 11:02:23 -0400
 
 utah (0.10ubuntu1) UNRELEASED; urgency=low
 
 
=== modified file 'docs/source/conf.py'
--- docs/source/conf.py	2013-04-18 10:46:00 +0000
+++ docs/source/conf.py	2013-04-25 15:05:30 +0000
@@ -148,8 +148,7 @@
 
     return description, options, epilog
 
-module_names = ('client', 'run_install_test', 'run_test_cobbler',
-                'run_test_vm', 'run_utah_tests')
+module_names = ('client', 'run_utah_tests')
 for module_name in module_names:
     module = __import__(module_name)
     parser = module.get_parser()
@@ -367,13 +366,6 @@
 man_pages = [
     ('man/utah', 'utah', u'UTAH client test runner',
      [u'Canonical Ltd'], 1),
-    ('man/run_install_test.py', 'run_install_test.py',
-     u'UTAH server test runner (provisioning)', [u'Canonical Ltd'], 1),
-    ('man/run_test_cobbler.py', 'run_test_cobbler.py',
-     u'UTAH server test runner (physical hardware)', [u'Canonical Ltd'], 1),
-    ('man/run_test_vm.py', 'run_test_vm.py',
-     u'UTAH server test runner (virtual hardware)',
-     [u'Canonical Ltd'], 1),
     ('man/run_utah_tests.py', 'run_utah_tests.py',
      u'UTAH server test runner (any hardware)', [u'Canonical Ltd'], 1),
 ]
 
=== removed file 'docs/source/man/run_install_test.py.rst'
--- docs/source/man/run_install_test.py.rst	2012-09-05 11:30:16 +0000
+++ docs/source/man/run_install_test.py.rst	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-:orphan:
-
-run_install_test.py manual page
-===============================
-
-Synopsis
---------
-**run_install_test.py** [options] [runlist ...]
-
-Description
------------
-.. include:: run_install_test_description.txt
-
-Options
--------
-.. include:: run_install_test_options.txt
-
-Examples
---------
-.. include:: run_install_test_epilog.txt
-
-See also
---------
-:manpage:`run_test_cobbler.py(1)`
-:manpage:`run_test_vm.py(1)`
-:manpage:`run_utah_tests.py(1)`
 
=== removed file 'docs/source/man/run_test_cobbler.py.rst'
--- docs/source/man/run_test_cobbler.py.rst	2012-09-05 11:30:16 +0000
+++ docs/source/man/run_test_cobbler.py.rst	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-:orphan:
-
-run_test_cobbler.py manual page
-===============================
-
-Synopsis
---------
-**run_test_cobbler.py** [options] [runlist ...]
-
-Description
------------
-.. include:: run_test_cobbler_description.txt
-
-Options
--------
-.. include:: run_test_cobbler_options.txt
-
-Examples
---------
-.. include:: run_test_cobbler_epilog.txt
-
-See also
---------
-:manpage:`run_install_test.py(1)`
-:manpage:`run_test_vm.py(1)`
-:manpage:`run_utah_tests.py(1)`
 
=== removed file 'docs/source/man/run_test_vm.py.rst'
--- docs/source/man/run_test_vm.py.rst	2012-09-05 11:30:16 +0000
+++ docs/source/man/run_test_vm.py.rst	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-:orphan:
-
-run_test_vm.py manual page
-==========================
-
-Synopsis
---------
-**run_test_vm.py** [options] [runlist ...]
-
-Description
------------
-.. include:: run_test_vm_description.txt
-
-Options
--------
-.. include:: run_test_vm_options.txt
-
-Examples
---------
-.. include:: run_test_vm_epilog.txt
-
-See also
---------
-:manpage:`run_install_test.py(1)`
-:manpage:`run_test_cobbler.py(1)`
-:manpage:`run_utah_tests.py(1)`
 
=== removed file 'examples/run_install_test.py'
--- examples/run_install_test.py	2013-04-18 14:15:12 +0000
+++ examples/run_install_test.py	1970-01-01 00:00:00 +0000
@@ -1,114 +0,0 @@
-#!/usr/bin/env python
-
-# Ubuntu Testing Automation Harness
-# Copyright 2012 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Create a VM and run a test."""
-
-
-import argparse
-import logging
-import sys
-
-from utah.cleanup import cleanup
-from utah.exceptions import UTAHException
-from utah.group import check_user_group, print_group_error_message
-from utah.provisioning.vm.vm import CustomVM, TinySQLiteInventory
-from utah.run import (
-    common_arguments,
-    custom_arguments,
-    file_arguments,
-    run_tests,
-    virtual_arguments,
-    configure_logging,
-    ReturnCodes,
-)
-
-
-def get_parser():
-    parser = argparse.ArgumentParser(
-        description=('Provision a machine '
-                     'and run one or more UTAH runlists there.'),
-        epilog=("For example:\n"
-                "Provision a VM using a precise server image "
-                "with i386 architecture and run the two given runlists\n"
-                "\t%(prog)s -s precise -t server -a i386 \\\n"
-                "\t\t/usr/share/utah/client/examples/master.run \\\n"
-                "\t\t'http://people.canonical.com/~max/max_test.run'"),
-        formatter_class=argparse.RawDescriptionHelpFormatter)
-    parser = common_arguments(parser)
-    parser = custom_arguments(parser)
-    parser = file_arguments(parser)
-    parser = virtual_arguments(parser)
-    return parser
-
-
-def run_install_test(args=None):
-    if args is None:
-        args = get_parser().parse_args()
-
-    if not check_user_group():
-        print_group_error_message(__file__)
-        sys.exit(ReturnCodes.GROUP_ERROR)
-
-    locallogs = []
-    exitstatus = ReturnCodes.SUCCESS
-    machine = None
-
-    configure_logging(args.debug)
-
-    try:
-        inventory = TinySQLiteInventory()
-        machine = inventory.request(
-            CustomVM,
-            arch=args.arch, boot=args.boot, clean=(not args.no_destroy),
-            debug=args.debug, diskbus=args.diskbus,
-            disksizes=args.gigabytes, dlpercentincrement=10,
-            emulator=args.emulator, image=args.image, initrd=args.initrd,
-            installtype=args.type, kernel=args.kernel, new=True,
-            preseed=args.preseed, rewrite=args.rewrite,
-            series=args.series, xml=args.xml)
-        exitstatus, locallogs = run_tests(args, machine)
-    finally:
-        if not args.no_destroy and machine is not None:
-            try:
-                machine.destroy()
-            except UTAHException as error:
-                sys.stderr.write('Failed to destroy machine: ' + str(error))
-            finally:
-                try:
-                    inventory.destroy(machine.machineid)
-                except UTAHException as error:
-                    sys.stderr.write('Failed to update inventory: '
-                                     + str(error))
-                finally:
-                    del machine
-        if len(locallogs) != 0:
-            print('Test logs copied to the following files:')
-            print("\t" + "\n\t".join(locallogs))
-
-    sys.exit(exitstatus)
-
-
-if __name__ == '__main__':
-    logging.warning('This script is deprecated; please use run_utah_tests.py')
-    logging.warning('The same command line arguments should work there, i.e.:')
-    argv = list(sys.argv)
-    argv[0] = 'run_utah_tests.py'
-    logging.warning(' '.join(argv))
-    try:
-        run_install_test()
-    finally:
-        cleanup.run()
 
=== removed file 'examples/run_test_bamboo_feeder.py'
--- examples/run_test_bamboo_feeder.py	2013-04-10 15:34:49 +0000
+++ examples/run_test_bamboo_feeder.py	1970-01-01 00:00:00 +0000
@@ -1,119 +0,0 @@
-#!/usr/bin/env python
-
-# Ubuntu Testing Automation Harness
-# Copyright 2012 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Provision a panda board in a bamboo-feeder setup and run a test."""
-
-
-import argparse
-import os
-import sys
-import logging
-
-from utah.cleanup import cleanup
-from utah.exceptions import UTAHException
-from utah.group import check_user_group, print_group_error_message
-from utah.provisioning.baremetal.bamboofeeder import BambooFeederMachine
-from utah.provisioning.baremetal.inventory import \
-    ManualBaremetalSQLiteInventory
-from utah.run import (
-    common_arguments,
-    custom_arguments,
-    name_argument,
-    run_tests,
-    configure_logging,
-    ReturnCodes,
-)
-
-
-def get_parser():
-    parser = argparse.ArgumentParser(
-        description=('Provision a pandaboard in a bamboo-feeder setup '
-                     'and run one or more UTAH runlists there.'),
-        epilog=("For example:\n"
-                "Provision a machine using a precise server image "
-                "with i386 architecture and run the two given runlists\n"
-                "\t%(prog)s -s precise -t server -a i386 \\\n"
-                "\t\t/usr/share/utah/client/examples/master.run \\\n"
-                "\t\t'http://people.canonical.com/~max/max_test.run'"),
-        formatter_class=argparse.RawDescriptionHelpFormatter)
-    parser = common_arguments(parser)
-    parser = custom_arguments(parser)
-    parser = name_argument(parser)
-    return parser
-
-
-def run_test_bamboo_feeder(args=None):
-    if args is None:
-        args = get_parser().parse_args()
-
-    if not check_user_group():
-        print_group_error_message(__file__)
-        sys.exit(ReturnCodes.GROUP_ERROR)
-
-    locallogs = []
-    exitstatus = ReturnCodes.SUCCESS
-    machine = None
-
-    configure_logging(args.debug)
-
-    try:
-        inventory = ManualBaremetalSQLiteInventory(
-            db=os.path.join('~', '.utah-bamboofeeder-inventory'),
-            lockfile=os.path.join('~', '.utah-bamboofeeder-lock'))
-        kw = {}
-        for arg in ['boot', 'image', 'preseed']:
-            value = getattr(args, arg)
-            if value is not None:
-                kw[arg] = value
-        machine = inventory.request(machinetype=BambooFeederMachine,
-                                    clean=(not args.no_destroy),
-                                    debug=args.debug, new=True,
-                                    dlpercentincrement=10, **kw)
-        exitstatus, locallogs = run_tests(args, machine)
-
-    except UTAHException as error:
-        mesg = 'Exception: ' + str(error)
-        try:
-            logging.error(mesg)
-        except (AttributeError, NameError):
-            sys.stderr.write(mesg)
-        exitstatus = ReturnCodes.UTAH_EXCEPTION_ERROR
-    except Exception:
-        logging.exception('Unhandled error in UTAH')
-        exitstatus = ReturnCodes.UNHANDLED_ERROR
-    finally:
-        if machine is not None:
-            try:
-                machine.destroy()
-            except UTAHException as error:
-                sys.stderr.write('Failed to destroy machine: ' + str(error))
-
-        if len(locallogs) != 0:
-            print('Test logs copied to the following files:')
-            print("\t" + "\n\t".join(locallogs))
-
-    sys.exit(exitstatus)
-
-
-if __name__ == '__main__':
-    logging.warning('This script is thought to be broken')
-    logging.warning('If it is working, please report it to the UTAH team via '
-                    '[e-mail]')
-    try:
-        run_test_bamboo_feeder()
-    finally:
-        cleanup.run()
 
=== removed file 'examples/run_test_cobbler.py'
--- examples/run_test_cobbler.py	2013-04-10 15:34:49 +0000
+++ examples/run_test_cobbler.py	1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-#!/usr/bin/env python
-
-# Ubuntu Testing Automation Harness
-# Copyright 2012 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Provision a machine with cobbler and run a test."""
-
-
-import argparse
-import sys
-import logging
-
-from utah.cleanup import cleanup
-from utah.exceptions import UTAHException
-from utah.group import check_user_group, print_group_error_message
-from utah.provisioning.baremetal.cobbler import CobblerMachine
-from utah.provisioning.baremetal.inventory import \
-    ManualBaremetalSQLiteInventory
-from utah.run import (
-    common_arguments,
-    custom_arguments,
-    name_argument,
-    run_tests,
-    configure_logging,
-    ReturnCodes,
-)
-
-
-def get_parser():
-    parser = argparse.ArgumentParser(
-        description=('Provision a machine using cobbler '
-                     'and run one or more UTAH runlists there.'),
-        epilog=("For example:\n"
-                "Provision a machine using a precise server image "
-                "with i386 architecture and run the two given runlists\n"
-                "\t%(prog)s -s precise -t server -a i386 \\\n"
-                "\t\t/usr/share/utah/client/examples/master.run \\\n"
-                "\t\t'http://people.canonical.com/~max/max_test.run'"),
-        formatter_class=argparse.RawDescriptionHelpFormatter)
-    parser = common_arguments(parser)
-    parser = custom_arguments(parser)
-    parser = name_argument(parser)
-    return parser
-
-
-def run_test_cobbler(args=None):
-    if args is None:
-        args = get_parser().parse_args()
-
-    if not check_user_group():
-        print_group_error_message(__file__)
-        sys.exit(ReturnCodes.GROUP_ERROR)
-
-    locallogs = []
-    exitstatus = ReturnCodes.SUCCESS
-    machine = None
-
-    configure_logging(args.debug)
-
-    try:
-        inventory = ManualBaremetalSQLiteInventory()
-        kw = {}
-        for arg in ['arch',
-                    'boot',
-                    'image',
-                    'preseed',
-                    'rewrite',
-                    'series',
-                    ]:
-            value = getattr(args, arg)
-            if value is not None:
-                kw[arg] = value
-        if getattr(args, 'type') is not None:
-            kw['installtype'] = args.type
-        machine = inventory.request(CobblerMachine,
-                                    clean=(not args.no_destroy),
-                                    debug=args.debug, dlpercentincrement=10,
-                                    name=args.name, new=True, **kw)
-        exitstatus, locallogs = run_tests(args, machine)
-
-    except UTAHException as error:
-        mesg = 'Exception: ' + str(error)
-        try:
-            logging.error(mesg)
-        except (AttributeError, NameError):
-            sys.stderr.write(mesg)
-        exitstatus = ReturnCodes.UTAH_EXCEPTION_ERROR
-    except Exception:
-        logging.exception('Unhandled error in UTAH')
-        exitstatus = ReturnCodes.UNHANDLED_ERROR
-    finally:
-        if machine is not None:
-            try:
-                machine.destroy()
-            except UTAHException as error:
-                sys.stderr.write('Failed to destroy machine: ' + str(error))
-
-        if len(locallogs) != 0:
-            print('Test logs copied to the following files:')
-            print("\t" + "\n\t".join(locallogs))
-
-    sys.exit(exitstatus)
-
-
-if __name__ == '__main__':
-    logging.warning('This script is deprecated; please use run_utah_tests.py')
-    logging.warning('Add the -m physical argument to your existing list, i.e.:')
-    argv = list(sys.argv)
-    argv[0] = 'run_utah_tests.py'
-    argv.extend(['-m', 'physical'])
-    logging.warning(' '.join(argv))
-    try:
-        run_test_cobbler()
-    finally:
-        cleanup.run()
 
=== removed file 'examples/run_test_vm.py'
--- examples/run_test_vm.py	2013-04-10 15:34:49 +0000
+++ examples/run_test_vm.py	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-#!/usr/bin/env python
-
-# Ubuntu Testing Automation Harness
-# Copyright 2012 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Create a VM and run a test."""
-
-
-import argparse
-import logging
-import sys
-
-from utah.cleanup import cleanup
-from utah.exceptions import UTAHException
-from utah.group import check_user_group, print_group_error_message
-from utah.provisioning.vm.vm import TinySQLiteInventory
-from utah.run import (
-    common_arguments,
-    run_tests,
-    configure_logging,
-    ReturnCodes,
-)
-
-
-def get_parser():
-    parser = argparse.ArgumentParser(
-        description=('Create a virtual machine '
-                     'and run a UTAH runlist there.'),
-        epilog=("For example:\n"
-                "Provision a VM using a precise server image "
-                "with i386 architecture and run the two given runlists\n"
-                "\t%(prog)s -s precise -t server -a i386 \\\n"
-                "\t\t/usr/share/utah/client/examples/master.run \\\n"
-                "\t\t'http://people.canonical.com/~max/max_test.run'"),
-        formatter_class=argparse.RawDescriptionHelpFormatter)
-    return common_arguments(parser)
-
-
-def run_test_vm(args=None):
-    if args is None:
-        args = get_parser().parse_args()
-
-    if not check_user_group():
-        print_group_error_message(__file__)
-        sys.exit(ReturnCodes.GROUP_ERROR)
-
-    locallogs = []
-    exitstatus = ReturnCodes.SUCCESS
-    machine = None
-
-    configure_logging(args.debug)
-
-    try:
-        inventory = TinySQLiteInventory()
-        kw = {}
-        for arg in ['arch', 'series']:
-            value = getattr(args, arg)
-            if value is not None:
-                kw[arg] = value
-        if args.type is not None:
-            kw.update([('installtype', args.type)])
-        machine = inventory.request(clean=(not args.no_destroy),
-                                    debug=args.debug, new=True,
-                                    dlpercentincrement=10, **kw)
-        exitstatus, locallogs = run_tests(args, machine)
-
-    except UTAHException as error:
-        sys.stderr.write('Exception: ' + str(error))
-        exitstatus = ReturnCodes.UTAH_EXCEPTION_ERROR
-    except Exception:
-        logging.exception('Unhandled error in UTAH')
-        exitstatus = ReturnCodes.UNHANDLED_ERROR
-    finally:
-        if not args.no_destroy and machine is not None:
-            try:
-                machine.destroy()
-            except UTAHException as error:
-                sys.stderr.write('Failed to destroy machine: ' + str(error))
-            finally:
-                try:
-                    inventory.destroy(machine.machineid)
-                except UTAHException as error:
-                    sys.stderr.write('Failed to update inventory: '
-                                     + str(error))
-                finally:
-                    del machine
-        if len(locallogs) != 0:
-            print('Test logs copied to the following files:')
-            print("\t" + "\n\t".join(locallogs))
-
-        sys.exit(exitstatus)
-
-
-if __name__ == '__main__':
-    logging.warning('This script is deprecated; please use run_utah_tests.py')
-    logging.warning('The same command line arguments should work there, i.e.:')
-    argv = list(sys.argv)
-    argv[0] = 'run_utah_tests.py'
-    logging.warning(' '.join(argv))
-    try:
-        run_test_vm()
-    finally:
-        cleanup.run()
 
=== modified file 'examples/run_utah_tests.py'
--- examples/run_utah_tests.py	2013-04-24 11:37:21 +0000
+++ examples/run_utah_tests.py	2013-04-25 15:05:30 +0000
@@ -20,27 +20,31 @@
 
 import argparse
 import logging
+import os
 import sys
+
 from traceback import format_exception
 
 import utah
+
 from utah import config
 from utah.cleanup import cleanup
+from utah.exceptions import UTAHException
 from utah.group import check_user_group, print_group_error_message
+from utah.provisioning.baremetal.bamboofeeder import BambooFeederMachine
+from utah.provisioning.baremetal.cobbler import CobblerMachine
+from utah.provisioning.baremetal.inventory import \
+    ManualBaremetalSQLiteInventory
+from utah.provisioning.ssh import ProvisionedMachine
+from utah.provisioning.vm.vm import TinySQLiteInventory
 from utah.run import (
-    common_arguments,
-    custom_arguments,
-    file_arguments,
-    name_argument,
-    virtual_arguments,
     configure_logging,
+    master_runlist_argument,
     run_tests,
     ReturnCodes,
 )
 from utah.timeout import timeout, UTAHTimeout
-from run_install_test import run_install_test
-from utah.provisioning.ssh import ProvisionedMachine
-from utah.exceptions import UTAHException
+from utah.url import url_argument
 
 
 def get_parser():
@@ -64,11 +68,63 @@
     parser.add_argument('--skip-provisioning', action='store_true',
                         help=('Reuse a system that is already provisioned '
                               '(name argument must be passed)'))
-    parser = common_arguments(parser)
-    parser = custom_arguments(parser)
-    parser = file_arguments(parser)
-    parser = name_argument(parser)
-    parser = virtual_arguments(parser)
+    parser.add_argument('runlist', metavar='runlist',
+                        type=master_runlist_argument,
+                        help='URLs of runlist files to run')
+    parser.add_argument('-s', '--series', metavar='SERIES',
+                        choices=config.serieschoices,
+                        help='Series to use for VM creation (%(choices)s)')
+    parser.add_argument('-t', '--type', metavar='TYPE',
+                        choices=('desktop', 'server', 'mini', 'alternate'),
+                        help=('Install type to use for VM creation '
+                              '(%(choices)s)'))
+    parser.add_argument('-a', '--arch', metavar='ARCH',
+                        choices=('i386', 'amd64', 'arm'),
+                        help=('Architecture to use for VM creation '
+                              '(%(choices)s)'))
+    parser.add_argument('-n', '--no-destroy', action='store_true',
+                        help='Preserve VM after tests have run')
+    parser.add_argument('-d', '--debug', action='store_true',
+                        help='Enable debug logging')
+    parser.add_argument('-j', '--json', action='store_true',
+                        help='Enable json logging (default is YAML)')
+    parser.add_argument('-f', '--files', action='append',
+                        help='File or directory to copy from test system ')
+    parser.add_argument('-o', '--outdir',
+                        help=('Directory to store locally copied files '
+                              '(Default is {}/machine-name)'
+                              .format(config.logpath)))
+    parser.add_argument('--dumplogs', action='store_true',
+                        help='Write client output logs to standard out')
+    parser.add_argument('--outputpreseed', action='store_true',
+                        help='Copy preseed to logs directory and list as '
+                        'log file in output')
+    parser.add_argument('-i', '--image', type=url_argument,
+                        help='Image/ISO file to use for installation')
+    parser.add_argument('-p', '--preseed', type=url_argument,
+                        help='Preseed file to use for installation')
+    parser.add_argument('-b', '--boot',
+                        help='Boot arguments for initial installation')
+    parser.add_argument('--rewrite', choices=('all', 'minimal', 'casperonly',
+                        'none'), help='Enable or disable automatic '
+                        'configuration rewriting')
+    parser.add_argument('-k', '--kernel', type=url_argument,
+                        help='Kernel file to use for installation')
+    parser.add_argument('-r', '--initrd', type=url_argument,
+                        help='InitRD file to use for installation')
+    parser.add_argument('--name', help='Name of machine to provision')
+    parser.add_argument('-e', '--emulator',
+                        help=('Emulator to use (kvm and qemu are supported, '
+                              'kvm will be favored if available)'))
+    parser.add_argument('-x', '--xml', type=url_argument,
+                        help='XML VM definition file')
+    parser.add_argument('-g', '--gigabytes', action='append',
+                        help=('Size in gigabytes of virtual disk, '
+                              'specify more than once for multiple disks'))
+    parser.add_argument('--diskbus', metavar='DISKBUS',
+                        choices=('virtio', 'sata', 'ide'),
+                        help=('Disk bus to use for customvm installation '
+                              '(%(choices)s)'))
     return parser
 
 
@@ -78,57 +134,71 @@
 
     if not check_user_group():
         print_group_error_message(__file__)
-        sys.exit(ReturnCodes.GROUP_ERROR)
+        return ReturnCodes.GROUP_ERROR
 
-    if args.machinetype is None:
+    if args.arch:
+        arch = args.arch
+    else:
+        arch = config.arch
+    if args.machinetype:
+        machinetype = args.machinetype
+    else:
         machinetype = config.machinetype
-    else:
-        machinetype = args.machinetype
 
     configure_logging(args.debug)
     logging.info('UTAH version: %s', utah.__version__)
 
-    # Default is now CustomVM
-    function = run_install_test
+    exitstatus = ReturnCodes.SUCCESS
+    locallogs = []
 
     if args.skip_provisioning:
-        def run_provisioned_tests(args):
-            """Run test cases in a provisioned machine."""
-            locallogs = []
-            try:
-                # TBD: Inventory should be used to verify machine
-                # is not running other tests
-                machine = ProvisionedMachine(name=args.name)
-                exitstatus, locallogs = run_tests(args, machine)
-            finally:
-                if len(locallogs) != 0:
-                    print('Test logs copied to the following files:')
-                    print("\t" + "\n\t".join(locallogs))
-            sys.exit(ReturnCodes.SUCCESS)
-
-        function = run_provisioned_tests
-    if args.arch is not None and 'arm' in args.arch:
-        # If arch is arm, use BambooFeederMachine
-        from run_test_bamboo_feeder import run_test_bamboo_feeder
-        function = run_test_bamboo_feeder
-    elif machinetype == 'physical':
-        # If machinetype is physical but arch isn't arm, use CobblerMachine
-        from run_test_cobbler import run_test_cobbler
-        function = run_test_cobbler
-
-    function(args=args)
+        # 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,
+              }
+        for arg in ['arch',
+                    'boot',
+                    'debug',
+                    'image',
+                    'initrd',
+                    'kernel',
+                    'name',
+                    'preseed',
+                    'rewrite',
+                    'series',
+                    ]:
+            kw[arg] = getattr(args, arg)
+        kw['installtype'] = args.type
+        if machinetype == 'physical':
+            if arch and 'arm' in arch:
+                inventory = ManualBaremetalSQLiteInventory(
+                    db=os.path.join('~', '.utah-bamboofeeder-inventory'),
+                    lockfile=os.path.join('~', '.utah-bamboofeeder-lock'))
+                kw['machinetype'] = BambooFeederMachine
+            else:
+                inventory = ManualBaremetalSQLiteInventory()
+                kw['machinetype'] = CobblerMachine
+        else:
+            inventory = TinySQLiteInventory()
+            for arg in ['diskbus', 'emulator', 'xml']:
+                kw[arg] = getattr(args, arg)
+            kw['disksizes'] = args.gigabytes
+        machine = inventory.request(**kw)
+    exitstatus, locallogs = run_tests(args, machine)
+    if len(locallogs) > 0:
+        print('Test logs copied to the following files:')
+        print("\t" + "\n\t".join(locallogs))
+
+    return(exitstatus)
+
 
 if __name__ == '__main__':
     try:
-        try:
-            if isinstance(config.jobtimeout, int):
-                timeout(config.jobtimeout, run_utah_tests)
-            else:
-                run_utah_tests()
-        except AttributeError:
-            run_utah_tests()
-        finally:
-            cleanup.run()
+        exitstatus = timeout(getattr(config, 'jobtimeout', None),
+                             run_utah_tests)
     except UTAHTimeout as exception:
         sys.stderr.write('UTAH timeout: {}\n'.format(exception.message))
         sys.exit(ReturnCodes.TIMEOUT_ERROR)
@@ -139,3 +209,6 @@
         sys.stderr.write('Unhandled error in UTAH:\n{}\n'
                          .format(''.join(format_exception(*sys.exc_info()))))
         sys.exit(ReturnCodes.UNHANDLED_ERROR)
+    finally:
+        cleanup.run()
+    sys.exit(exitstatus)
 
=== modified file 'utah/config.py'
--- utah/config.py	2013-04-04 14:55:25 +0000
+++ utah/config.py	2013-04-25 15:05:30 +0000
@@ -60,6 +60,8 @@
     boottimeout=90,
     # Time to wait between checking if system is available over ssh
     checktimeout=15,
+    # Default setting for whether to clean up after a test run
+    clean=True,
     # Default log level to print to the console
     consoleloglevel=logging.WARNING,
     # Default debug setting
@@ -67,7 +69,7 @@
     # Command to download test images
     dlcommand='dl-ubuntu-test-iso',
     # Percentage increment at which to report download updates
-    dlpercentincrement=1,
+    dlpercentincrement=10,
     # Number of times to retry image download
     dlretries=10,
     # Default diskbus for VMs
@@ -117,8 +119,12 @@
     outputpreseed=False,
     # Directory where utah client and other needed packages reside
     packagedir=os.path.join('/', 'usr', 'share', 'utah'),
+    # Command to use to power cycle machine
+    powercmd=None,
     # Time to wait between power off and power on for physical systems
     powertimeout=15,
+    # Prefix for machine names
+    prefix='utah',
     # Default preseed
     preseed=os.path.join('/', 'etc', 'utah', 'default-preseed.cfg'),
     # Location of PXE configuration files
 
=== modified file 'utah/provisioning/baremetal/power.py'
--- utah/provisioning/baremetal/power.py	2013-04-04 13:19:16 +0000
+++ utah/provisioning/baremetal/power.py	2013-04-25 15:05:30 +0000
@@ -40,8 +40,7 @@
             for item in machineinfo:
                 if 'power' in item:
                     self.power[item] = machineinfo[item]
-        if powercmd is not None:
-            self.powercmd = powercmd
+        self.powercmd = (powercmd or config.powercmd)
         super(PowerMixin, self).__init__(*args, **kw)
 
     def powercommand(self):
 
=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py	2013-04-24 11:37:21 +0000
+++ utah/provisioning/provisioning.py	2013-04-25 15:05:30 +0000
@@ -65,11 +65,10 @@
     """
 
     def __init__(self, arch=None, boot=None, clean=True, debug=False,
-                 directory=None, image=None, dlpercentincrement=1,
+                 directory=None, image=None, dlpercentincrement=None,
                  initrd=None, installtype=None, kernel=None, machineid=None,
-                 machineuuid=None, name=None, new=False, prefix='utah',
-                 preseed=None, rewrite=None, series=None, template=None,
-                 xml=None):
+                 machineuuid=None, name=None, new=False, preseed=None,
+                 rewrite=None, series=None, template=None, xml=None):
         """Initialize the object representing the machine.
 
         One of these groups of arguments should be included:
@@ -96,7 +95,6 @@
                 supplied.
             new: Request a new machine (or a reinstall if a specific machine
                 was requested.)
-            prefix: prefix for automatically named machines.
             rewrite: How much to alter supplied preseed and xml files.
                 all:         everything we need for an automated install
                 minimal:     insert latecommand into preseed
@@ -115,44 +113,26 @@
         """
         # TODO: Make this work right with super at some point.
         # TODO: Consider a global temp file creator, maybe as part of install.
-        self.debug = debug
-        self.dlpercentincrement = dlpercentincrement
-        self.machineid = machineid
-        self.new = new
-        self.prefix = prefix
-        self.template = template
+        args = ['arch',
+                'boot',
+                'clean',
+                'debug',
+                'dlpercentincrement',
+                'installtype',
+                'new',
+                'rewrite',
+                'series',
+                'template',
+                'uuid',
+                ]
+        for arg in args:
+            setattr(self, arg, (locals()[arg] or getattr(config, arg)))
 
         self.boottimeout = config.boottimeout
 
-        if clean is None:
-            self.clean = True
-        else:
-            self.clean = clean
-
         # TODO: Move namesetup into vm
         self._namesetup(name)
 
-        if arch is None:
-            self.arch = config.arch
-        else:
-            self.arch = arch
-        if boot is None:
-            self.boot = config.boot
-        else:
-            self.boot = boot
-        if installtype is None:
-            self.installtype = config.installtype
-        else:
-            self.installtype = installtype
-        if rewrite is None:
-            self.rewrite = config.rewrite
-        else:
-            self.rewrite = rewrite
-        if series is None:
-            self.series = config.series
-        else:
-            self.series = series
-
         if machineuuid is None:
             self.uuid = str(uuid.uuid4())
         else:
 
=== modified file 'utah/provisioning/vm/vm.py'
--- utah/provisioning/vm/vm.py	2013-04-18 17:17:45 +0000
+++ utah/provisioning/vm/vm.py	2013-04-25 15:05:30 +0000
@@ -135,7 +135,7 @@
     # TODO: probably remove parameters from the private methods
     def __init__(self, directory=None, diskbus=None, disksizes=None,
                  emulator=None, machineid=None, macs=None, name=None,
-                 prefix='utah', *args, **kw):
+                 prefix=None, *args, **kw):
         # Make sure that no other virtualization solutions are running
         # TODO: see if this is needed for qemu or just kvm
         process_checker = ProcessChecker()
@@ -145,16 +145,9 @@
                 message = process_checker.get_error_message(app)
                 raise UTAHVMProvisioningException(message)
 
-        if diskbus is None:
-            self.diskbus = config.diskbus
-        else:
-            self.diskbus = diskbus
-        if disksizes is None:
-            disksizes = config.disksizes
-        if disksizes is None:
-            self.disksizes = [8]
-        else:
-            self.disksizes = disksizes
+        args = ['diskbus', 'disksizes', 'emulator', 'prefix']
+        for arg in args:
+            setattr(self, arg, (locals()[arg] or getattr(config, arg)))
         self.disks = []
         if name is None:
             autoname = True
@@ -174,27 +167,20 @@
             self._loggerunsetup()
             self._loggersetup()
             self._cmdlinesetup()
-        if emulator is None:
-            emulator = config.emulator
-        if emulator is None:
+        if self.emulator is None:
             if self._supportsdomaintype('kvm'):
                 self.logger.info(
                     'Setting type to kvm since it is in libvirt capabilities')
-                self.domaintype = 'kvm'
+                self.emulator = 'kvm'
             elif self._supportsdomaintype('qemu'):
                 self.logger.info(
                     'Setting type to qemu since it is in libvirt capabilities')
-                self.domaintype = 'qemu'
+                self.emulator = 'qemu'
             else:
                 raise UTAHVMProvisioningException(
                     'kvm and qemu not supported in libvirt capabilities; '
                     'please make sure qemu and/or kvm are installed '
                     'and libvirt is configured correctly')
-        else:
-            self.domaintype = emulator
-        if self.domaintype == 'qemu':
-            self.logger.debug('Raising boot timeout for qemu domain')
-            self.boottimeout *= 4
         if macs is None:
             macs = []
         self.macs = macs
@@ -292,7 +278,7 @@
         xmlt.find('uuid').text = self.uuid
         self.logger.debug(
             'Setting type to qemu in case no hardware virtualization present')
-        xmlt.getroot().set('type', self.domaintype)
+        xmlt.getroot().set('type', self.emulator)
         ose = xmlt.find('os')
         if self.arch == ('i386'):
             ose.find('type').set('arch', 'i686')
 
=== modified file 'utah/run.py'
--- utah/run.py	2013-04-19 19:27:58 +0000
+++ utah/run.py	2013-04-25 15:05:30 +0000
@@ -33,22 +33,21 @@
     parse_yaml_file,
     ReturnCodes as ClientReturnCodes,
 )
-from utah.client.runner import Runner
 from utah.client.exceptions import (
     YAMLEmptyFile,
     YAMLParsingError,
 )
+from utah.client.runner import Runner
 from utah.exceptions import UTAHException
 from utah.retry import retry
 from utah.timeout import timeout
 from utah.url import url_argument
-from utah.provisioning.ssh import ProvisionedMachine
 
 
 # Return codes for the server
 class ReturnCodes:
 
-    """Provide standard return codes for run\_ scripts."""
+    r"""Provide standard return codes for run\_ scripts."""
 
     SUCCESS = 0  # No problems found
     UTAH_EXCEPTION_ERROR = 1  # UTAH exception caught
@@ -131,114 +130,8 @@
     return filename
 
 
-def common_arguments(parser):
-    """Centralize command line arguments for all run\_ scripts.
-
-    :returns: argparse parser with arguments added
-    :rtype: obj
-
-    """
-    parser.add_argument('runlist', metavar='runlist',
-                        type=master_runlist_argument,
-                        help='URLs of runlist files to run')
-    parser.add_argument('-s', '--series', metavar='SERIES',
-                        choices=config.serieschoices,
-                        help='Series to use for VM creation (%(choices)s)')
-    parser.add_argument('-t', '--type', metavar='TYPE',
-                        choices=('desktop', 'server', 'mini', 'alternate'),
-                        help=('Install type to use for VM creation '
-                              '(%(choices)s)'))
-    parser.add_argument('-a', '--arch', metavar='ARCH',
-                        choices=('i386', 'amd64'),
-                        help=('Architecture to use for VM creation '
-                              '(%(choices)s)'))
-    parser.add_argument('-n', '--no-destroy', action='store_true',
-                        help='Preserve VM after tests have run')
-    parser.add_argument('-d', '--debug', action='store_true',
-                        help='Enable debug logging')
-    parser.add_argument('-j', '--json', action='store_true',
-                        help='Enable json logging (default is YAML)')
-    parser.add_argument('-f', '--files', action='append',
-                        help='File or directory to copy from test system ')
-    parser.add_argument('-o', '--outdir',
-                        help=('Directory to store locally copied files '
-                              '(Default is {}/machine-name)'
-                              .format(config.logpath)))
-    parser.add_argument('--dumplogs', action='store_true',
-                        help='Write client output logs to standard out')
-    parser.add_argument('--outputpreseed', action='store_true',
-                        help='Copy preseed to logs directory and list as '
-                        'log file in output')
-    return parser
-
-
-def custom_arguments(parser):
-    """Centralize arguments for installing from an image.
-
-    :returns: argparse parser with arguments added
-    :rtype: obj
-
-    """
-    parser.add_argument('-i', '--image', type=url_argument,
-                        help='Image/ISO file to use for installation')
-    parser.add_argument('-p', '--preseed', type=url_argument,
-                        help='Preseed file to use for installation')
-    parser.add_argument('-b', '--boot',
-                        help='Boot arguments for initial installation')
-    parser.add_argument('--rewrite', choices=('all', 'minimal', 'casperonly',
-                        'none'), help='Enable or disable automatic '
-                        'configuration rewriting')
-    return parser
-
-
-def file_arguments(parser):
-    """Centralize arguments for custom kernel and initrd support.
-
-    :returns: argparse parser with arguments added
-    :rtype: obj
-
-    """
-    parser.add_argument('-k', '--kernel', type=url_argument,
-                        help='Kernel file to use for installation')
-    parser.add_argument('-r', '--initrd', type=url_argument,
-                        help='InitRD file to use for installation')
-    return parser
-
-
-def name_argument(parser):
-    """Centralize arguments for named machines.
-
-    :returns: argparse parser with arguments added
-    :rtype: obj
-
-    """
-    parser.add_argument('--name', help='Name of machine to provision')
-    return parser
-
-
-def virtual_arguments(parser):
-    """Centralize arguments for virtual machines.
-
-    :returns: argparse parser with arguments added
-    :rtype: obj
-
-    """
-    parser.add_argument('-e', '--emulator',
-                        help=('Emulator to use (kvm and qemu are supported, '
-                              'kvm will be favored if available)'))
-    parser.add_argument('-x', '--xml', type=url_argument,
-                        help='XML VM definition file')
-    parser.add_argument('-g', '--gigabytes', action='append',
-                        help=('Size in gigabytes of virtual disk, '
-                              'specify more than once for multiple disks'))
-    parser.add_argument('--diskbus', metavar='DISKBUS',
-                        choices=('virtio', 'sata', 'ide'),
-                        help=('Disk bus to use for customvm installation '
-                              '(%(choices)s)'))
-    return parser
-
-
 def _get_runlist(url):
+    # TODO: Make something that this and utah.iso._get_resource can both use
     try:
         return urllib.urlretrieve(url)[0]
     except urllib.ContentTooShortError as e:
@@ -329,21 +222,24 @@
     """Copy preseed to locallogs.
 
     If we are provisioning a system, we can optionally copy its preseed along
-    with other locallogs from the job. Systems already provisioned will not
+    with other locallogs from the job.
 
     """
-    if (not isinstance(machine, ProvisionedMachine) and
-            (args.outputpreseed or config.outputpreseed)):
+    if args.outputpreseed or config.outputpreseed:
         if args.outputpreseed:
             logging.debug('Capturing preseed due to command line option')
 
         p = os.path.join(config.logpath, '{}-preseed.cfg'.format(machine.name))
-        try:
-            shutil.copyfile(machine.finalpreseed, p)
-        except (IOError, shutil.Error) as err:
-            logging.warning('Failed to copy preseed file: %s', err)
+        if machine.hasattr('finalpreseed'):
+            try:
+                os.chmod(p, 0664)
+                shutil.copyfile(machine.finalpreseed, p)
+            except (IOError, OSError, shutil.Error) as err:
+                logging.warning('Failed to copy preseed file: %s', err)
+            else:
+                locallogs.append(p)
         else:
-            locallogs.append(p)
+            logging.debug('Machine has no preseed to capture')
 
 
 def run_tests(args, machine):
@@ -507,7 +403,7 @@
 
     """
     logging.info('Checking if UTAH client is finished')
-    machine.sshcheck()
+    machine.activecheck()
     try:
         exitstatus = machine.run('/usr/share/utah/client/utah-done.py',
                                  quiet=True)[0]