Merge lp:~rvb/maas-test/vm-series into lp:maas-test

[Raphaël Badin]

Add parameter to specify using a particular series for the VM.

[lp:~rvb/maas-test/vm-series]

86. By Raphaël Badin on 2013-12-06

Fix default param.

87. By Raphaël Badin on 2013-12-06

Generate man.

[Gavin Panella (allenap)]

"--vm-series" implies some knowledge of maas-test's internals. How about "--controller-series" or "--maas-series" or something better?

review: Approve

[Raphaël Badin (rvb)]

> "--vm-series" implies some knowledge of maas-test's internals. How about
> "--controller-series" or "--maas-series" or something better?

Hum, that's a good point. "--maas-series" sounds good.

[lp:~rvb/maas-test/vm-series]

88. By Raphaël Badin on 2013-12-09

Rename option to --maas-series.

=== modified file 'docs/man/maas-test.8.rst'
--- docs/man/maas-test.8.rst	2013-12-06 12:44:22 +0000
+++ docs/man/maas-test.8.rst	2013-12-09 16:30:28 +0000
@@ -156,6 +156,11 @@
   which defaults to `generic`, so e.g. `i386/generic` may be abbreviated to
   `i386`.  The default architecture is `amd64`.
 
+--maas-series=codename
+  Code name for the Ubuntu release series to install on the virtual
+  machine (where the MAAS server will be installed).  Defaults to the latest
+  stable Ubuntu series.
+
 --http-proxy=URL
   Use the given HTTP proxy for all downloads, both on the testing system and on
   the nodes: KVM images, MAAS boot images, and Ubuntu packages.  Like

=== modified file 'maastest/cases.py'
--- maastest/cases.py	2013-12-06 07:25:45 +0000
+++ maastest/cases.py	2013-12-09 16:30:28 +0000
@@ -83,7 +83,7 @@
             proxy_url = proxy.get_url()
 
         cls.machine = KVMFixture(
-            series='saucy', architecture=architecture,
+            series=cls.args.vm_series, architecture=architecture,
             proxy_url=proxy_url, direct_interface=cls.args.interface)
         cls.fixtures.addCleanup(delattr, cls, "machine")
         cls.fixtures.useFixture(cls.machine)

=== modified file 'maastest/parser.py'
--- maastest/parser.py	2013-12-06 07:47:07 +0000
+++ maastest/parser.py	2013-12-09 16:30:28 +0000
@@ -48,6 +48,7 @@
 
 
 latest_LTS_series = distro_info.UbuntuDistroInfo().lts()
+latest_released_series = distro_info.UbuntuDistroInfo().stable()
 
 
 def prepare_parser():
@@ -94,7 +95,16 @@
         help="Password for authenticating to the node's BMC.  "
              "Not needed in interactive mode.")
 
-   # MAAS images.
+    # VM details.
+    parser.add_argument(
+        '--maas-series', type=text_type,
+        choices=utils.get_supported_series(),
+        default=latest_released_series,
+        help="Code name for the Ubuntu release series to install on the "
+             "virtual machine (where the MAAS server will be installed).  "
+             "Defaults to the latest stable Ubuntu series (%(default)s).")
+
+    # MAAS images.
     parser.add_argument(
         '--series', type=text_type,
         choices=utils.get_supported_series(),

=== modified file 'man/maas-test.8'
--- man/maas-test.8	2013-12-06 12:44:22 +0000
+++ man/maas-test.8	2013-12-09 16:30:28 +0000
@@ -170,6 +170,11 @@
 which defaults to \fIgeneric\fP, so e.g. \fIi386/generic\fP may be abbreviated to
 \fIi386\fP\&.  The default architecture is \fIamd64\fP\&.
 .TP
+.BI \-\-maas\-series\fB= codename
+Code name for the Ubuntu release series to install on the virtual
+machine (where the MAAS server will be installed).  Defaults to the latest
+stable Ubuntu series.
+.TP
 .BI \-\-http\-proxy\fB= URL
 Use the given HTTP proxy for all downloads, both on the testing system and on
 the nodes: KVM images, MAAS boot images, and Ubuntu packages.  Like