Merge lp:~joetalbott/utah/install_type into lp:utah

[Joe Talbott]

This adds a --install-type option to the client to indicate the OS variant (i.e. desktop, server, mini, etc.)

Updated to use the machine's idea of installtype.

[Max Brustkern (nuclearbob)]

Args may not include a type, but we'll still get a type when we install the machine. I'd recommend we setup the extraopts after machine.installclient() and use machine.installtype. Is there some way for me to attach a branch or a diff that reflects that?

[Joe Talbott (joetalbott)]

I've updated my submission to match what I think Max was referring to.

review: Needs Resubmitting

[Max Brustkern (nuclearbob)]

Looks good to me.

review: Approve

[Javier Collado (javier.collado)]

Looks good to me too. With regard to the server, as long as `utah.iso.getinstalltype` does a good job, then the client should get the right type.

In addition to this, I ran a test with a quantal desktop iso and I saw the expected output with the right type in the console log:
INFO: Running command through SSH: utah --install-type desktop -r /tmp/default.run

review: Approve

=== modified file 'client.py'
--- client.py	2012-08-28 11:22:41 +0000
+++ client.py	2012-08-29 19:35:34 +0000
@@ -33,6 +33,10 @@
                         default='yaml', help='Output format (default "yaml")')
     parser.add_argument('-t', '--testdir',
                         default='/var/lib/utah', help='Main test directory')
+    parser.add_argument('-i', '--install-type',
+                        choices=['desktop', 'server', 'mini', 'alternate'],
+                        default='desktop',
+                        help='Installation Variant (i.e. server, desktop, etc.)')
     parser.add_argument('-r', '--runlist', type=url_argument,
                         # Having a default here means that if a resume happens
                         # post-reboot without a runlist specified, it will
@@ -97,6 +101,7 @@
     testdir = args.testdir
     runlist = args.runlist
     output = args.output
+    install_type = args.install_type
 
     if args.append:
         open_flags = 'a'
@@ -119,8 +124,9 @@
 
     try:
         state_agent = StateAgentYAML(state_file=state_file)
-        runner = Runner(state_agent=state_agent, result_class=result_class,
-                        runlist=runlist, resume=resume, testdir=testdir)
+        runner = Runner(install_type=install_type, state_agent=state_agent,
+                        result_class=result_class, runlist=runlist,
+                        resume=resume, testdir=testdir)
         if resume:
             runner.load_state()
 

=== modified file 'utah/client/result.py'
--- utah/client/result.py	2012-08-28 04:08:53 +0000
+++ utah/client/result.py	2012-08-29 19:35:34 +0000
@@ -40,7 +40,7 @@
     Result collection class.
     """
     def __init__(self, name=None, testsuite=None, testcase=None,
-            runlist=None, publish_type=None):
+            runlist=None, publish_type=None, install_type=None):
         self.results = []
         self.status = 'PASS'
         self.name = name
@@ -49,6 +49,7 @@
         self.runlist = runlist
         self.publish_type = publish_type
         self.publish = None
+        self.install_type = install_type
 
         self.errors = 0
         self.fetch_errors = 0
@@ -166,6 +167,7 @@
                 'passes': self.passes,
                 'uname': list(host_info['uname']),
                 'media-info': host_info['media-info'],
+                'install_type': self.install_type,
         }
 
         if self.publish is not None:

=== modified file 'utah/client/runner.py'
--- utah/client/runner.py	2012-08-28 11:22:41 +0000
+++ utah/client/runner.py	2012-08-29 19:35:34 +0000
@@ -110,7 +110,7 @@
             'required': True,
             }
 
-    def __init__(self, runlist=None, result_class=Result,
+    def __init__(self, install_type, runlist=None, result_class=Result,
             testdir=UTAH_DIR, state_agent=None, resume=False):
 
         # Runlist URL passed through the command line
@@ -138,6 +138,7 @@
         self.state_file = DEFAULT_STATE_FILE
         self.fetched_suites = {}
         self.timeout = None
+        self.install_type = install_type
 
         self.errors = 0
         self.passes = 0
@@ -164,6 +165,7 @@
 
         self.process_master_runlist(resume=resume)
         self.result.runlist = self.master_runlist
+        self.result.install_type = self.install_type
 
     def backup_rc_local(self):
         """

=== modified file 'utah/client/tests/test_runner.py'
--- utah/client/tests/test_runner.py	2012-08-08 16:17:12 +0000
+++ utah/client/tests/test_runner.py	2012-08-29 19:35:34 +0000
@@ -20,7 +20,7 @@
         self.result_class = ResultYAML
         self.state_file = '/tmp/state.yaml'
         self.state_agent = StateAgentYAML(state_file=self.state_file)
-        self.runner = Runner(result_class=self.result_class,
+        self.runner = Runner(install_type='desktop', result_class=self.result_class,
                              state_agent=self.state_agent)
         self.bad_dir = "/tmp/does_not_exist"
 
@@ -53,7 +53,7 @@
         fp.write(bad_runlist_content)
         fp.close()
 
-        runner = Runner(result_class=self.result_class,
+        runner = Runner(install_type='desktop', result_class=self.result_class,
                 state_agent=self.state_agent, runlist=runlist)
 
         # remove the runlist as early as possible to avoid leaving it
@@ -88,6 +88,7 @@
         """
         self.assertRaises(exceptions.BadDir,
                           Runner,
+                          install_type="desktop",
                           result_class=self.result_class,
                           testdir=self.bad_dir)
 
@@ -107,6 +108,7 @@
 
         self.assertRaises(exceptions.MissingFile,
                           Runner,
+                          install_type="desktop",
                           result_class=self.result_class,
                           runlist=tmp_master_runlist,
                           testdir=self.bad_dir)
@@ -121,7 +123,7 @@
         fp.write(master_runlist_content)
         fp.close()
 
-        runner = Runner(result_class=self.result_class, runlist=runlist)
+        runner = Runner(install_type='desktop', result_class=self.result_class, runlist=runlist)
         runner.save_state()
 
         print("tests: {}".format(runner.count_tests()))

=== modified file 'utah/client/tests/test_state_agent.py'
--- utah/client/tests/test_state_agent.py	2012-08-08 16:17:12 +0000
+++ utah/client/tests/test_state_agent.py	2012-08-29 19:35:34 +0000
@@ -80,7 +80,7 @@
                          "state file (%s) already exists" % self.state_file)
 
         self.state_agent = StateAgentYAML(state_file=self.state_file)
-        self.runner = Runner(result_class=ResultYAML,
+        self.runner = Runner(install_type="desktop", result_class=ResultYAML,
                              state_agent=self.state_agent)
         self.partial_state_file_content = partial_state_file_content
 
@@ -158,7 +158,7 @@
             shutil.copytree(test_src, test_dir)
 
         state_agent = StateAgentYAML(state_file=self.state_file)
-        runner = Runner(state_agent=state_agent, resume=True)
+        runner = Runner(install_type="desktop", state_agent=state_agent, resume=True)
         runner.load_state()
 
         self.assertEqual(runner.status, 'RUN')

=== modified file 'utah/run.py'
--- utah/run.py	2012-08-28 15:35:55 +0000
+++ utah/run.py	2012-08-29 19:35:34 +0000
@@ -30,6 +30,9 @@
     exitstatus = 0
 
     machine.installclient()
+
+    extraopts += " --install-type " + machine.installtype
+
     for runlist in args.runlists:
         locallist = urllib.urlretrieve(runlist)[0]
         machine.uploadfiles([locallist], os.path.normpath('/tmp'))