Merge lp:~rvb/maas-test/customize-series-arch into lp:maas-test

[Raphaël Badin]

Add option to let the user specify the series and the architecture for which images should be imported.

The main change here is the change to import_maas_images() and the related change to parser.py to let the user pass parameters down to import_maas_images().

The change to test_setUp_calls_methods_if_direct_ip_set (this change http://paste.ubuntu.com/6478367/ in maastest/tests/test_maasfixture.py) is nothing but a drive-by fix: we didn't check that import_maas_images was called as part of the setup, and now we do.

[Gavin Panella (allenap)]

Looks good.

[1]

+        :param series: The Ubuntu series that this MAAS server should use
+            to enlist and commission nodes.
+        :param series: The architecture that this MAAS server should import
+            images for, e.g. 'amd64', 'arm/hightbank'.  If the
+            subarchitecture isn't specified, 'generic' is assumed.

I think the second ":param series:" should be ":param architecture:".

[2]

+        :param series: The Ubuntu series for which images should be imported.
+        :param series: The architecture for which images should be imported,
+            e.g. 'amd64', 'arm/hightbank'.  If the
+            subarchitecture isn't specified, 'generic' is assumed.

Here too :)

[3]

+        if response.code != httplib.OK:
+            raise Exception("Error configure the commissiong series")

The response may have more information here. How about raising a
urllib2.HTTPError here (assuming that the underlying transport is
provided by urllib2)?

[4]

+        default=latest_LTS_series,
+        help="The Ubuntu series used to enlist and commission nodes, e.g. "
+             "saucy.  Defaults to the latest LTS series (i.e. %s)" %
+             latest_LTS_series)

You can use %(default)s in the help string, iirc:

        help="The Ubuntu series used to enlist and commission nodes, e.g. "
             "saucy.  Defaults to the latest LTS series (i.e. %(default)s)"

review: Approve

[lp:~rvb/maas-test/customize-series-arch]

62. By Raphaël Badin on 2013-11-26

Review fixes.

63. By Raphaël Badin on 2013-11-26

Merge trunk.

64. By Raphaël Badin on 2013-11-26

Merge trunk.

[Raphaël Badin (rvb)]

> Looks good.

Thanks for the review!

> I think the second ":param series:" should be ":param architecture:".

Oops, fixed! x @

> [3]
>
> +        if response.code != httplib.OK:
> +            raise Exception("Error configure the commissiong series")
>
> The response may have more information here. How about raising a
> urllib2.HTTPError here (assuming that the underlying transport is
> provided by urllib2)?

The idea of using the response' content is a good one… but I'm not sure we want to raise and exception of type urllib2.HTTPError. Maybe a good trade off would be to build a custom exception using the response's content (plus a custom error message). But I'll leave it for now as this is something that we will have to fix in many places if we decide to change our strategy. I've added a TODO.

> [4]
>
> +        default=latest_LTS_series,
> +        help="The Ubuntu series used to enlist and commission nodes, e.g. "
> +             "saucy.  Defaults to the latest LTS series (i.e. %s)" %
> +             latest_LTS_series)
>
> You can use %(default)s in the help string, iirc:
>
>        help="The Ubuntu series used to enlist and commission nodes, e.g. "
>             "saucy.  Defaults to the latest LTS series (i.e. %(default)s)"

Good point, fixed.

[lp:~rvb/maas-test/customize-series-arch]

65. By Raphaël Badin on 2013-11-26

Add TODO comment.