Merge lp:~jtv/maas/1.5-revert-bug-1311433 into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Revert 1.5 r2258: workaround for bug 1311433 (now properly fixed in Django).

Reverting this in the branch will save the distro people an unnecessary SRU.

Jeroen

=== modified file 'docs/conf.py'
--- docs/conf.py	2014-04-17 09:13:06 +0000
+++ docs/conf.py	2014-05-09 20:33:59 +0000
@@ -61,6 +61,23 @@
 
 # -- General configuration -----------------------------------------------------
 
+# Add a widget to switch between different versions of the documentation to
+# each generated page.
+add_version_switcher = False
+
+# In order for the version widget to be able to redirect correctly to the
+# other versions of the documentation, each version of the documentation
+# has to be accessible at the following addresses:
+# /<doc_prefix>/ -> documentation for trunk.
+# /<doc_prefix>1.4/ ->  documentation for 1.4.
+# etc.
+doc_prefix = 'docs'
+
+# Path of the JSON document, relative to homepage of the documentation for trunk
+# (i.e. '/<doc_prefix>/'), with the list of the versions to include in the
+# version switcher widget.
+versions_path = '_static/versions.js'
+
 # If your documentation needs a minimal Sphinx version, state it here.
 #needs_sphinx = '1.0'
 
@@ -280,19 +297,39 @@
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {'http://docs.python.org/': None}
-
-# Gather information about the branch and the build date.
-from subprocess import check_output
-bzr_last_revision_number = check_output(['bzr', 'revno'])
-bzr_last_revision_date = check_output(['bzr', 'version-info', '--template={date}', '--custom'])
-bzr_build_date = check_output(['bzr', 'version-info', '--template={build_date}', '--custom'])
-
-# Populate html_context with the variables used in the templates.
-html_context = {
-    'add_version_switcher': 'true' if add_version_switcher else 'false',
-    'versions_json_path': '/'.join(['', doc_prefix, versions_path]),
-    'doc_prefix': doc_prefix,
-    'bzr_last_revision_date': bzr_last_revision_date,
-    'bzr_last_revision_number': bzr_last_revision_number,
-    'bzr_build_date': bzr_build_date,
-}
+<<<<<<< TREE
+
+# Gather information about the branch and the build date.
+from subprocess import check_output
+bzr_last_revision_number = check_output(['bzr', 'revno'])
+bzr_last_revision_date = check_output(['bzr', 'version-info', '--template={date}', '--custom'])
+bzr_build_date = check_output(['bzr', 'version-info', '--template={build_date}', '--custom'])
+
+# Populate html_context with the variables used in the templates.
+html_context = {
+    'add_version_switcher': 'true' if add_version_switcher else 'false',
+    'versions_json_path': '/'.join(['', doc_prefix, versions_path]),
+    'doc_prefix': doc_prefix,
+    'bzr_last_revision_date': bzr_last_revision_date,
+    'bzr_last_revision_number': bzr_last_revision_number,
+    'bzr_build_date': bzr_build_date,
+}
+=======
+
+# Gather information about the branch and the build date.
+from subprocess import check_output
+bzr_last_revision_number = check_output(['bzr', 'revno'])
+bzr_last_revision_date = check_output(['bzr', 'version-info', '--template={date}', '--custom'])
+bzr_build_date = check_output(['bzr', 'version-info', '--template={build_date}', '--custom'])
+
+# Populate html_context with the variables used in the templates.
+html_context = {
+    'add_version_switcher': 'true' if add_version_switcher else 'false',
+    'versions_json_path': '/'.join(['', doc_prefix, versions_path]),
+    'doc_prefix': doc_prefix,
+    'bzr_last_revision_date': bzr_last_revision_date,
+    'bzr_last_revision_number': bzr_last_revision_number,
+    'bzr_build_date': bzr_build_date,
+}
+
+>>>>>>> MERGE-SOURCE

=== modified file 'docs/hardware-enablement-kernels.rst'
--- docs/hardware-enablement-kernels.rst	2014-04-14 21:42:00 +0000
+++ docs/hardware-enablement-kernels.rst	2014-05-09 20:33:59 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 .. -*- mode: rst -*-
 
 .. _hardware-enablement-kernels:
@@ -91,3 +92,98 @@
 the Node's page and clicking ``Edit node``. Under the Architecture field,
 you will be able to select any HWE kernels that have been imported onto
 that node's cluster controller.
+=======
+.. -*- mode: rst -*-
+
+.. _hardware-enablement-kernels:
+
+=================================
+Using hardware-enablement kernels
+=================================
+
+.. note::
+
+  This feature is available in MAAS versions 1.5 and above.
+
+MAAS allows you to use hardware enablement kernels when booting nodes
+that require them.
+
+What are hardware-enablement kernels?
+-------------------------------------
+
+Brand new hardware gets released all the time. We want that hardware to
+work well wih Ubuntu and MAAS, even if it was released after the latest
+release of MAAS or Ubuntu. Hardware Enablement (HWE) is all about making
+keeping pace with the new hardware. 
+
+Ubuntu's solution to this is to offer newer kernels for older releases.
+There are at least two kernels on offer for Ubuntu releases: the
+"generic" kernel -- i.e. the kernel released with the current series --
+and the Hardware Enablement kernel, which is the most recent kernel
+release.
+
+There are separate HWE kernels for each release of Ubuntu, referred to
+as ``hwe-<release letter>``. So, the 14.04 / Trusty Tahr HWE kernel is
+called ``hwe-t``, the 12.10 / Quantal Quetzal HWE kernel is called
+``hwe-q`` and so on. This allows you to use newer kernels with older
+releases, for example running Precise with a Saucy (hwe-s) kernel.
+
+For more information see the `LTS Enablement Stack`_ page on the Ubuntu
+wiki.
+
+.. _LTS Enablement Stack:
+   https://wiki.ubuntu.com/Kernel/LTSEnablementStack
+
+Importing hardware-enablement kernels
+-------------------------------------
+
+Hardware-enablement kernels need to be imported to a cluster controller
+before that cluster's nodes can use them.
+
+In order to import HWE kernels to a cluster controller you need to edit
+the controller's ``/etc/maas/bootresources.yaml`` file, and update the
+subarches that you want to import, like this::
+
+  boot:
+    storage: "/var/lib/maas/boot-resources/"
+
+    sources:
+      - path: "http://maas.ubuntu.com/images/ephemeral-v2/releases/"
+        keyring: "/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg"
+        selections:
+          - release: "precise"
+            arches: ["i386", "amd64"]
+            subarches: ["generic", "hwe-q", "hwe-r", "hwe-s", "hwe-t"]
+            labels: ["release"]
+
+Once you've updated ``bootresources.yaml``, you can tell the cluster to
+re-import its boot images using the ``maas`` command (You will need to
+:ref:`be logged in to the API first <api-key>`)::
+
+ $ maas <profile-name> node-group import-boot-images \
+   <cluster-controller-uuid> 
+
+You can also tell the cluster controller to re-import its boot images by
+clicking the ``Import boot images`` button in the ``Clusters`` page of
+the MAAS web UI.
+
+Using hardware-enablement kernels in MAAS
+-----------------------------------------
+
+A MAAS administrator can choose to use HWE kernels on a per-node basis
+in MAAS.
+
+The quickest way to do this is using the MAAS command, like this::
+
+  $ maas <profile-name> node update <system-id>
+    architecture=amd64/hwe-t
+
+If you specify an architecture that doesn't exist (e.g.
+``amd64/hwe-z``), the ``maas`` command will return an error.
+
+
+It's also possible to use HWE kernels from the MAAS web UI, by visiting
+the Node's page and clicking ``Edit node``. Under the Architecture field,
+you will be able to select any HWE kernels that have been imported onto
+that node's cluster controller.
+>>>>>>> MERGE-SOURCE

=== modified file 'docs/installing-ubuntu.rst'
--- docs/installing-ubuntu.rst	2014-05-05 16:20:18 +0000
+++ docs/installing-ubuntu.rst	2014-05-09 20:33:59 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 =====================================
 Installing Ubuntu and deploying nodes
 =====================================
@@ -80,3 +81,90 @@
 on Launchpad.
 
 .. _curtin project: https://launchpad.net/curtin
+=======
+=====================================
+Installing Ubuntu and deploying nodes
+=====================================
+
+Once a node has been accepted into MAAS and is ready for use, users can
+deploy services to that node.
+
+Prior to deployment, MAAS is responsible for:
+
+1. Powering up the node.
+2. Installing Ubuntu on the node.
+3. Installing the user's SSH keys on the node.
+
+Once these steps have been completed, the node is ready to have services
+deployed to it, either manually or by using a tool like Juju_.
+
+There are two ways to install Ubuntu on a node:
+
+1. :ref:`The default installer <default-installer>`.
+2. :ref:`The fast installer <fast-installer>`.
+
+.. _Juju: http://juju.ubuntu.com
+
+.. _default-installer:
+
+The default installer
+----------------------
+
+The default installer installs Ubuntu on a node in exactly the same way
+as you would install it manually: using the `Debian Installer`_.
+Installation is handled by the Debian installer. Answers to the
+questions asked by the installer are provided in a 'preseed' file. For
+more information on preseed files, see the :ref:`Additional
+Configuration <preseed>` page.
+
+As the name suggests, the default installer is enabled by default for
+all new nodes. To enable the default installer for a node that's been
+configured to use the fast installer, visit the node's page as an
+administrator and click the ``Use the default installer`` button.
+
+.. image:: media/node-page-use-default-installer.png
+
+To set multiple nodes to use the default installer, select the ``Mark
+nodes as using the default installer`` option from the bulk action menu
+on the ``Nodes`` page in the MAAS web UI.
+
+Because it installs Ubuntu from scratch, downloading packages as
+required, the default installer is slower than the :ref:`fast installer
+<fast-installer>`.
+
+.. _Debian Installer: http://www.debian.org/devel/debian-installer/
+
+.. _fast-installer:
+
+The fast installer
+------------------
+
+The fast installer is, as the name suggests, a means of installing
+Ubuntu on a node more quickly than would be possible using the
+:ref:`default installer <default-installer>`.
+
+To enable the fast installer for a node, visit the node's page as an
+administrator and click the ``Use the fast installer`` button.
+
+.. image:: media/node-page-use-fast-installer.png
+
+To set multiple nodes to use the fast installer, select the ``Mark nodes
+as using the fase installer`` option from the bulk action menu on the
+``Nodes`` page in the MAAS web UI.
+
+The fast installer copies a pre-built Ubuntu image to the node, with all
+the packages installed that would be normally found in an Ubuntu
+installation.
+
+The fast installer is much quicker than the default installer, but has
+the disadvantage that it's less easy to configure a node at install
+time, since the fast installer doesn't use a :ref:`preseed file
+<preseed>`. In addition, the packages that are initially installed on a
+fast-installed node need updating manually, since they are part of the
+installation image and not downloaded fresh from an apt repository.
+
+For more information about the fast installer, see the `curtin project`_
+on Launchpad.
+
+.. _curtin project: https://launchpad.net/curtin
+>>>>>>> MERGE-SOURCE

=== modified file 'etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py'
--- etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py	2014-04-04 06:46:05 +0000
+++ etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py	2014-05-09 20:33:59 +0000
@@ -165,10 +165,12 @@
 
     for key, expected_value in user_settings.iteritems():
         # Password isn't included in checkout.
-        if key != 'Password':
-            value = bmc_user_get(user_number, key)
-            if value != expected_value:
-                bad_values[key] = value
+        if key == 'Password':
+            continue
+
+        actual_value = bmc_user_get(user_number, key)
+        if expected_value != actual_value:
+            bad_values[key] = actual_value
 
     if len(bad_values) == 0:
         return
@@ -177,8 +179,8 @@
         "for '%s', expected '%s', actual '%s';" % (
             key, user_settings[key], actual_value)
         for key, actual_value in bad_values.iteritems()
-        ]).rstrip(';')
-    message = "IPMI user setting verification failures: %s." % (errors_string)
+    ]).rstrip(';')
+    message = 'IPMI user setting verification failures: %s.' % (errors_string)
     raise IPMIError(message)
 
 

=== modified file 'etc/maas/templates/power/amt.template'
=== modified file 'src/maascli/api.py'
--- src/maascli/api.py	2014-04-04 06:46:05 +0000
+++ src/maascli/api.py	2014-05-09 20:33:59 +0000
@@ -21,6 +21,7 @@
 from email.message import Message
 from functools import partial
 import httplib
+from itertools import chain
 import json
 from operator import itemgetter
 import re

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2014-05-07 02:44:10 +0000
+++ src/maasserver/api.py	2014-05-09 20:33:59 +0000
@@ -2310,10 +2310,10 @@
         line(doc.handler.__doc__)
         line()
         line()
-        for (http_method, op), function in sorted(exports):
+        for (http_method, operation), function in sorted(exports):
             line("``%s %s``" % (http_method, uri_template), end="")
-            if op is not None:
-                line(" ``op=%s``" % op)
+            if operation is not None:
+                line(" ``op=%s``" % operation)
             line()
             docstring = getdoc(function)
             if docstring is not None:

=== modified file 'src/maasserver/forms.py'
=== modified file 'src/maasserver/migrations/0072_remove_ipmi_autodetect.py'
--- src/maasserver/migrations/0072_remove_ipmi_autodetect.py	2014-04-10 11:13:41 +0000
+++ src/maasserver/migrations/0072_remove_ipmi_autodetect.py	2014-05-09 20:33:59 +0000
@@ -1,7 +1,16 @@
+<<<<<<< TREE
 from django.db.utils import ProgrammingError
 from maasserver import logger
+=======
+>>>>>>> MERGE-SOURCE
 from provisioningserver.power_schema import IPMI_DRIVER
+<<<<<<< TREE
+=======
+# -*- coding: utf-8 -*-
+>>>>>>> MERGE-SOURCE
 from south.v2 import DataMigration
+from django.db.utils import ProgrammingError
+from maasserver import logger
 
 
 class Migration(DataMigration):

=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2014-05-07 02:44:10 +0000
+++ src/maasserver/models/node.py	2014-05-09 20:33:59 +0000
@@ -23,7 +23,6 @@
     repeat,
     )
 import random
-import re
 from string import whitespace
 from uuid import uuid1
 
@@ -153,43 +152,6 @@
     """Raised when a node has an unknown power type."""
 
 
-def validate_hostname(hostname):
-    """Validator for hostnames.
-
-    :param hostname: Input value for a host name.  May include domain.
-    :raise ValidationError: If the hostname is not valid according to RFCs 952
-        and 1123.
-    """
-    # Valid characters within a hostname label: ASCII letters, ASCII digits,
-    # hyphens, and underscores.  Not all are always valid.
-    # Technically we could write all of this as a single regex, but it's not
-    # very good for code maintenance.
-    label_chars = re.compile('[a-zA-Z0-9_-]*$')
-
-    if len(hostname) > 255:
-        raise ValidationError(
-            "Hostname is too long.  Maximum allowed is 255 characters.")
-    # A hostname consists of "labels" separated by dots.
-    labels = hostname.split('.')
-    if '_' in labels[0]:
-        # The host label cannot contain underscores; the rest of the name can.
-        raise ValidationError(
-            "Host label cannot contain underscore: %r." % labels[0])
-    for label in labels:
-        if len(label) == 0:
-            raise ValidationError("Hostname contains empty name.")
-        if len(label) > 63:
-            raise ValidationError(
-                "Name is too long: %r.  Maximum allowed is 63 characters."
-                % label)
-        if label.startswith('-') or label.endswith('-'):
-            raise ValidationError(
-                "Name cannot start or end with hyphen: %r." % label)
-        if not label_chars.match(label):
-            raise ValidationError(
-                "Name contains disallowed characters: %r." % label)
-
-
 class NodeManager(Manager):
     """A utility to manage the collection of Nodes."""
 
@@ -446,7 +408,7 @@
 
     :ivar system_id: The unique identifier for this `Node`.
         (e.g. 'node-41eba45e-4cfa-11e1-a052-00225f89f211').
-    :ivar hostname: This `Node`'s hostname.  Must conform to RFCs 952 and 1123.
+    :ivar hostname: This `Node`'s hostname.
     :ivar status: This `Node`'s status. See the vocabulary
         :class:`NODE_STATUS`.
     :ivar owner: This `Node`'s owner if it's in use, None otherwise.
@@ -466,9 +428,7 @@
         max_length=41, unique=True, default=generate_node_system_id,
         editable=False)
 
-    hostname = CharField(
-        max_length=255, default='', blank=True, unique=True,
-        validators=[validate_hostname])
+    hostname = CharField(max_length=255, default='', blank=True, unique=True)
 
     status = IntegerField(
         max_length=10, choices=NODE_STATUS_CHOICES, editable=False,

=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2014-05-07 02:44:10 +0000
+++ src/maasserver/models/tests/test_node.py	2014-05-09 20:33:59 +0000
@@ -40,7 +40,6 @@
 from maasserver.models.node import (
     generate_hostname,
     NODE_TRANSITIONS,
-    validate_hostname,
     )
 from maasserver.models.user import create_auth_token
 from maasserver.testing import reload_object
@@ -84,114 +83,6 @@
         self.assertEqual(sizes, [len(hostname) for hostname in hostnames])
 
 
-class TestHostnameValidator(MAASTestCase):
-    """Tests for the validation of hostnames.
-
-    Specifications based on:
-        http://en.wikipedia.org/wiki/Hostname#Restrictions_on_valid_host_names
-
-    This does not support Internationalized Domain Names.  To do so, we'd have
-    to accept and store unicode, but use the Punycode-encoded version.  The
-    validator would have to validate both versions: the unicode input for
-    invalid characters, and the encoded version for length.
-    """
-    def make_maximum_hostname(self):
-        """Create a hostname of the maximum permitted length.
-
-        The maximum permitted length is 255 characters.  The last label in the
-        hostname will not be of the maximum length, so tests can still append a
-        character to it without creating an invalid label.
-
-        The hostname is not randomised, so do not count on it being unique.
-        """
-        # A hostname may contain any number of labels, separated by dots.
-        # Each of the labels has a maximum length of 63 characters, so this has
-        # to be built up from multiple labels.
-        ten_chars = ('a' * 9) + '.'
-        hostname = ten_chars * 25 + ('b' * 5)
-        self.assertEqual(255, len(hostname))
-        return hostname
-
-    def assertAccepts(self, hostname):
-        """Assertion: the validator accepts `hostname`."""
-        try:
-            validate_hostname(hostname)
-        except ValidationError as e:
-            raise AssertionError(unicode(e))
-
-    def assertRejects(self, hostname):
-        """Assertion: the validator rejects `hostname`."""
-        self.assertRaises(ValidationError, validate_hostname, hostname)
-
-    def test_accepts_ascii_letters(self):
-        self.assertAccepts('abcde')
-
-    def test_accepts_dots(self):
-        self.assertAccepts('abc.def')
-
-    def test_rejects_adjacent_dots(self):
-        self.assertRejects('abc..def')
-
-    def test_rejects_leading_dot(self):
-        self.assertRejects('.abc')
-
-    def test_rejects_trailing_dot(self):
-        self.assertRejects('abc.')
-
-    def test_accepts_ascii_digits(self):
-        self.assertAccepts('abc123')
-
-    def test_accepts_leading_digits(self):
-        # Leading digits used to be forbidden, but are now allowed.
-        self.assertAccepts('123abc')
-
-    def test_rejects_whitespace(self):
-        self.assertRejects('a b')
-        self.assertRejects('a\nb')
-        self.assertRejects('a\tb')
-
-    def test_rejects_other_ascii_characters(self):
-        self.assertRejects('a?b')
-        self.assertRejects('a!b')
-        self.assertRejects('a,b')
-        self.assertRejects('a:b')
-        self.assertRejects('a;b')
-        self.assertRejects('a+b')
-        self.assertRejects('a=b')
-
-    def test_accepts_underscore_in_domain(self):
-        self.assertAccepts('host.local_domain')
-
-    def test_rejects_underscore_in_host(self):
-        self.assertRejects('host_name.local')
-
-    def test_accepts_hyphen(self):
-        self.assertAccepts('a-b')
-
-    def test_rejects_hyphen_at_start_of_label(self):
-        self.assertRejects('-ab')
-
-    def test_rejects_hyphen_at_end_of_label(self):
-        self.assertRejects('ab-')
-
-    def test_accepts_maximum_valid_length(self):
-        self.assertAccepts(self.make_maximum_hostname())
-
-    def test_rejects_oversized_hostname(self):
-        self.assertRejects(self.make_maximum_hostname() + 'x')
-
-    def test_accepts_maximum_label_length(self):
-        self.assertAccepts('a' * 63)
-
-    def test_rejects_oversized_label(self):
-        self.assertRejects('b' * 64)
-
-    def test_rejects_nonascii_letter(self):
-        # The \u03be is the Greek letter xi.  Perfectly good letter, just not
-        # ASCII.
-        self.assertRejects('\u03be')
-
-
 class NodeTest(MAASServerTestCase):
 
     def test_system_id(self):
@@ -203,12 +94,6 @@
         self.assertEqual(len(node.system_id), 41)
         self.assertTrue(node.system_id.startswith('node-'))
 
-    def test_hostname_is_validated(self):
-        bad_hostname = '-_?!@*-'
-        self.assertRaises(
-            ValidationError,
-            factory.make_node, hostname=bad_hostname)
-
     def test_work_queue_returns_nodegroup_uuid(self):
         nodegroup = factory.make_node_group()
         node = factory.make_node(nodegroup=nodegroup)
@@ -332,14 +217,14 @@
         Config.objects.set_config("enlistment_domain", '')
         existing_node = factory.make_node(hostname='hostname')
 
-        hostnames = [existing_node.hostname, "new-hostname"]
+        hostnames = [existing_node.hostname, "new_hostname"]
         self.patch(
             node_module, "generate_hostname",
             lambda size: hostnames.pop(0))
 
         node = factory.make_node()
         node.set_random_hostname()
-        self.assertEqual('new-hostname', node.hostname)
+        self.assertEqual('new_hostname', node.hostname)
 
     def test_get_effective_power_type_raises_if_not_set(self):
         node = factory.make_node(power_type='')

=== modified file 'src/maasserver/support/pertenant/tests/test_migration.py'
--- src/maasserver/support/pertenant/tests/test_migration.py	2014-04-04 06:46:05 +0000
+++ src/maasserver/support/pertenant/tests/test_migration.py	2014-05-09 20:33:59 +0000
@@ -156,18 +156,14 @@
         self.assertEqual(get_legacy_user(), get_destination_user())
 
     def test_get_destination_user_with_user_from_juju_state(self):
-        user = factory.make_user()
-        # Also create another user.
-        factory.make_user()
-        node = factory.make_node(owner=user)
+        user1, user2 = factory.make_user(), factory.make_user()
+        node = factory.make_node(owner=user1)
         make_provider_state_file(node)
-        self.assertEqual(user, get_destination_user())
+        self.assertEqual(user1, get_destination_user())
 
     def test_get_destination_user_with_orphaned_juju_state(self):
-        user = factory.make_user()
-        # Also create another user.
-        factory.make_user()
-        node = factory.make_node(owner=user)
+        user1, user2 = factory.make_user(), factory.make_user()
+        node = factory.make_node(owner=user1)
         make_provider_state_file(node)
         node.delete()  # Orphan the state.
         self.assertEqual(get_legacy_user(), get_destination_user())

=== modified file 'src/maasserver/testing/factory.py'
--- src/maasserver/testing/factory.py	2014-05-06 21:44:04 +0000
+++ src/maasserver/testing/factory.py	2014-05-09 20:33:59 +0000
@@ -648,8 +648,8 @@
         else:
             vlan_tags = [None] * number
         return [
-            self.make_network(vlan_tag=tag, **kwargs)
-            for tag in vlan_tags
+            self.make_network(vlan_tag=vlan_tag, **kwargs)
+            for vlan_tag in vlan_tags
             ]
 
     def make_boot_source(self, cluster=None, url=None,

=== modified file 'src/maasserver/tests/test_api_node.py'
--- src/maasserver/tests/test_api_node.py	2014-04-25 18:03:38 +0000
+++ src/maasserver/tests/test_api_node.py	2014-05-09 20:33:59 +0000
@@ -503,12 +503,14 @@
             hostname='diane', owner=self.logged_in_user,
             architecture=make_usable_architecture(self))
         response = self.client_put(
-            self.get_node_uri(node), {'hostname': '.'})
+            self.get_node_uri(node), {'hostname': 'too long' * 100})
         parsed_result = json.loads(response.content)
 
         self.assertEqual(httplib.BAD_REQUEST, response.status_code)
         self.assertEqual(
-            {'hostname': ["Hostname contains empty name."]},
+            {'hostname':
+                ['Ensure this value has at most 255 characters '
+                 '(it has 800).']},
             parsed_result)
 
     def test_PUT_refuses_to_update_invisible_node(self):

=== modified file 'src/maasserver/tests/test_api_nodegroup.py'
=== modified file 'src/maasserver/tests/test_forms.py'
=== modified file 'src/maasserver/views/nodes.py'
--- src/maasserver/views/nodes.py	2014-04-25 18:03:38 +0000
+++ src/maasserver/views/nodes.py	2014-05-09 20:33:59 +0000
@@ -24,8 +24,12 @@
     'prefetch_nodes_listing',
     ]
 
+<<<<<<< TREE
 from cgi import escape
 from textwrap import dedent
+=======
+from cgi import escape
+>>>>>>> MERGE-SOURCE
 from urllib import urlencode
 
 from django.conf import settings as django_settings
@@ -90,6 +94,7 @@
     )
 from metadataserver.models import NodeCommissionResult
 from provisioningserver.tags import merge_details_cleanly
+from textwrap import dedent
 
 
 def get_longpoll_context():

=== modified file 'src/maasserver/views/tests/test_clusters.py'
--- src/maasserver/views/tests/test_clusters.py	2014-04-04 06:46:05 +0000
+++ src/maasserver/views/tests/test_clusters.py	2014-05-09 20:33:59 +0000
@@ -262,11 +262,11 @@
         self.client_log_in(as_admin=True)
         nodegroup = factory.make_node_group()
         interfaces = set()
-        for _ in range(3):
-            interfaces.add(
-                factory.make_node_group_interface(
-                    nodegroup=nodegroup,
-                    management=NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED))
+        for i in range(3):
+            interface = factory.make_node_group_interface(
+                nodegroup=nodegroup,
+                management=NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED)
+            interfaces.add(interface)
         links = get_content_links(
             self.client.get(reverse('cluster-edit', args=[nodegroup.uuid])))
         interface_edit_links = [

=== modified file 'src/maasserver/views/tests/test_general.py'
--- src/maasserver/views/tests/test_general.py	2014-04-04 06:46:05 +0000
+++ src/maasserver/views/tests/test_general.py	2014-05-09 20:33:59 +0000
@@ -418,7 +418,8 @@
             # to display all the errors.
             component = factory.make_name('component')
             error_message = factory.make_name('error')
-            errors.append(Fault(fault, error_message))
+            error = Fault(fault, error_message)
+            errors.append(error)
             register_persistent_error(component, error_message)
         links = [
             reverse('index'),

=== modified file 'src/maasserver/views/tests/test_nodes.py'
--- src/maasserver/views/tests/test_nodes.py	2014-04-25 18:03:38 +0000
+++ src/maasserver/views/tests/test_nodes.py	2014-05-09 20:33:59 +0000
@@ -16,6 +16,7 @@
 
 from cgi import escape
 import httplib
+from cgi import escape
 from operator import attrgetter
 import os
 from random import randint
@@ -30,6 +31,7 @@
 from lxml.etree import XPath
 from lxml.html import fromstring
 import maasserver.api
+from maasserver.third_party_drivers import get_third_party_driver
 from maasserver.enum import (
     NODE_STATUS,
     NODEGROUP_STATUS,
@@ -68,10 +70,17 @@
 from maasserver.views import nodes as nodes_views
 from maasserver.views.nodes import message_from_form_stats
 from maastesting.djangotestcase import count_queries
-from metadataserver.models.commissioningscript import (
-    LIST_MODALIASES_OUTPUT_NAME,
-    LLDP_OUTPUT_NAME,
-    )
+<<<<<<< TREE
+from metadataserver.models.commissioningscript import (
+    LIST_MODALIASES_OUTPUT_NAME,
+    LLDP_OUTPUT_NAME,
+    )
+=======
+from metadataserver.models.commissioningscript import (
+    LLDP_OUTPUT_NAME,
+    LIST_MODALIASES_OUTPUT_NAME,
+    )
+>>>>>>> MERGE-SOURCE
 from testtools.matchers import ContainsAll
 
 

=== modified file 'src/provisioningserver/custom_hardware/seamicro.py'
--- src/provisioningserver/custom_hardware/seamicro.py	2014-04-08 20:58:05 +0000
+++ src/provisioningserver/custom_hardware/seamicro.py	2014-05-09 20:33:59 +0000
@@ -24,8 +24,17 @@
 import urlparse
 
 import provisioningserver.custom_hardware.utils as utils
+<<<<<<< TREE
 from seamicroclient import exceptions as seamicro_exceptions
 from seamicroclient.v2 import client as seamicro_client
+=======
+from seamicroclient.v2 import (
+    client as seamicro_client,
+    )
+from seamicroclient import (
+    exceptions as seamicro_exceptions,
+    )
+>>>>>>> MERGE-SOURCE
 
 
 logger = logging.getLogger(__name__)

=== modified file 'src/provisioningserver/import_images/boot_resources.py'
--- src/provisioningserver/import_images/boot_resources.py	2014-04-28 14:19:28 +0000
+++ src/provisioningserver/import_images/boot_resources.py	2014-05-09 20:33:59 +0000
@@ -79,6 +79,132 @@
     return entry
 
 
+<<<<<<< TREE
+=======
+def mirror_info_for_path(path, unsigned_policy=None, keyring=None):
+    if unsigned_policy is None:
+        unsigned_policy = lambda content, path, keyring: content
+    (mirror, rpath) = path_from_mirror_url(path, None)
+    policy = policy_read_signed
+    if rpath.endswith(".json"):
+        policy = unsigned_policy
+    if keyring:
+        policy = functools.partial(policy, keyring=keyring)
+    return(mirror, rpath, policy)
+
+
+class RepoDumper(BasicMirrorWriter):
+
+    def dump(self, path, keyring=None):
+        self._boot = create_empty_hierarchy()
+        (mirror, rpath, policy) = mirror_info_for_path(path, keyring=keyring)
+        reader = UrlMirrorReader(mirror, policy=policy)
+        super(RepoDumper, self).sync(reader, rpath)
+        return self._boot
+
+    def load_products(self, path=None, content_id=None):
+        return
+
+    def item_cleanup(self, item):
+        keys_to_keep = ['content_id', 'product_name', 'version_name', 'path']
+        compact_item = {key: item[key] for key in keys_to_keep}
+        return compact_item
+
+    def insert_item(self, data, src, target, pedigree, contentsource):
+        item = products_exdata(src, pedigree)
+        arch, subarches = item['arch'], item['subarches']
+        release = item['release']
+        label = item['label']
+        compact_item = self.item_cleanup(item)
+        for subarch in subarches.split(','):
+            if not self._boot[arch][subarch][release][label]:
+                self._boot[arch][subarch][release][label] = compact_item
+
+
+class RepoWriter(BasicMirrorWriter):
+
+    def __init__(self, root_path, cache_path, info):
+        self._root_path = os.path.abspath(root_path)
+        self._info = info
+        self._cache = FileStore(os.path.abspath(cache_path))
+        super(RepoWriter, self).__init__()
+
+    def write(self, path, keyring=None):
+        (mirror, rpath, policy) = mirror_info_for_path(path, keyring=keyring)
+        reader = UrlMirrorReader(mirror, policy=policy)
+        super(RepoWriter, self).sync(reader, rpath)
+
+    def load_products(self, path=None, content_id=None):
+        return
+
+    def filter_version(self, data, src, target, pedigree):
+        item = products_exdata(src, pedigree)
+        content_id, product_name = item['content_id'], item['product_name']
+        version_name = item['version_name']
+        return (
+            content_id in self._info and
+            product_name in self._info[content_id] and
+            version_name in self._info[content_id][product_name]
+        )
+
+    def insert_file(self, name, tag, checksums, size, contentsource):
+        logger.info("Inserting file %s (tag=%s, size=%s).", name, tag, size)
+        self._cache.insert(
+            tag, contentsource, checksums, mutable=False, size=size)
+        return [(self._cache._fullpath(tag), name)]
+
+    def insert_root_image(self, tag, checksums, size, contentsource):
+        root_image_tag = 'root-image-%s' % tag
+        root_image_path = self._cache._fullpath(root_image_tag)
+        root_tgz_tag = 'root-tgz-%s' % tag
+        root_tgz_path = self._cache._fullpath(root_tgz_tag)
+        if not os.path.isfile(root_image_path):
+            logger.info("New root image: %s.", root_image_path)
+            self._cache.insert(
+                tag, contentsource, checksums, mutable=False, size=size)
+            uncompressed = FdContentSource(
+                GzipFile(self._cache._fullpath(tag)))
+            self._cache.insert(root_image_tag, uncompressed, mutable=False)
+            self._cache.remove(tag)
+        if not os.path.isfile(root_tgz_path):
+            logger.info("Converting root tarball: %s.", root_tgz_path)
+            call_uec2roottar(root_image_path, root_tgz_path)
+        return [(root_image_path, 'root-image'), (root_tgz_path, 'root-tgz')]
+
+    def insert_item(self, data, src, target, pedigree, contentsource):
+        item = products_exdata(src, pedigree)
+        checksums = item_checksums(data)
+        tag = checksums['sha256']
+        size = data['size']
+        ftype = item['ftype']
+        if ftype == 'root-image.gz':
+            links = self.insert_root_image(tag, checksums, size, contentsource)
+        else:
+            links = self.insert_file(
+                ftype, tag, checksums, size, contentsource)
+        content_id = item['content_id']
+        prod_name = item['product_name']
+        version_name = item['version_name']
+        for subarch in self._info[content_id][prod_name][version_name]:
+            dst_folder = os.path.join(
+                self._root_path, item['arch'], subarch, item['release'],
+                item['label'])
+            if not os.path.exists(dst_folder):
+                os.makedirs(dst_folder)
+            for src, link_name in links:
+                link_path = os.path.join(dst_folder, link_name)
+                if os.path.isfile(link_path):
+                    os.remove(link_path)
+                os.link(src, link_path)
+
+
+def available_boot_resources(root):
+    for resource_path in glob.glob(os.path.join(root, '*/*/*/*')):
+        arch, subarch, release, label = resource_path.split('/')[-4:]
+        yield (arch, subarch, release, label)
+
+
+>>>>>>> MERGE-SOURCE
 def install_boot_loaders(destination):
     """Install the all the required file from each bootloader method.
     :param destination: Directory where the loaders should be stored.
@@ -195,7 +321,19 @@
         return
 
     storage = config['boot']['storage']
+<<<<<<< TREE
     meta_file_content = image_descriptions.dump_json()
+=======
+
+    boot = create_empty_hierarchy()
+    dumper = RepoDumper()
+
+    for source in config['boot']['sources']:
+        repo_boot = dumper.dump(source['path'], keyring=source['keyring'])
+        boot_merge(boot, repo_boot, source['selections'])
+
+    meta_file_content = json.dumps(boot, sort_keys=True)
+>>>>>>> MERGE-SOURCE
     if meta_contains(storage, meta_file_content):
         # The current maas.meta already contains the new config.  No need to
         # rewrite anything.

=== modified file 'src/provisioningserver/import_images/tests/test_boot_resources.py'
--- src/provisioningserver/import_images/tests/test_boot_resources.py	2014-04-28 14:19:28 +0000
+++ src/provisioningserver/import_images/tests/test_boot_resources.py	2014-05-09 20:33:59 +0000
@@ -15,8 +15,6 @@
 __all__ = []
 
 import errno
-import hashlib
-import json
 import os
 from random import randint
 from subprocess import (
@@ -25,12 +23,15 @@
     )
 
 from maastesting.factory import factory
+<<<<<<< TREE
 from maastesting.matchers import MockAnyCall
+=======
+>>>>>>> MERGE-SOURCE
 from maastesting.testcase import MAASTestCase
-import mock
-from provisioningserver.boot.uefi import UEFIBootMethod
+from mock import MagicMock
 from provisioningserver.config import BootConfig
 from provisioningserver.import_images import boot_resources
+<<<<<<< TREE
 from provisioningserver.import_images.boot_image_mapping import (
     BootImageMapping,
     )
@@ -44,8 +45,11 @@
     FileExists,
     )
 import yaml
-
-
+=======
+>>>>>>> MERGE-SOURCE
+
+
+<<<<<<< TREE
 class TestTgtEntry(MAASTestCase):
     """Tests for `tgt_entry`."""
 
@@ -95,8 +99,241 @@
     return summer.hexdigest()
 
 
+=======
+def make_image_spec():
+    """Return an `ImageSpec` with random values."""
+    return boot_resources.ImageSpec(
+        factory.make_name('arch'),
+        factory.make_name('subarch'),
+        factory.make_name('release'),
+        factory.make_name('label'),
+        )
+
+
+class TestIterateBootResources(MAASTestCase):
+    """Tests for `iterate_boot_resources`."""
+
+    def test_empty_hierarchy_yields_nothing(self):
+        self.assertItemsEqual(
+            [],
+            boot_resources.iterate_boot_resources(
+                boot_resources.create_empty_hierarchy()))
+
+    def test_finds_boot_resource(self):
+        image_spec = make_image_spec()
+        arch, subarch, release, label = image_spec
+        self.assertItemsEqual(
+            [image_spec],
+            boot_resources.iterate_boot_resources(
+                {arch: {subarch: {release: {label: factory.make_name()}}}}))
+
+
+class TestValuePassesFilterList(MAASTestCase):
+    """Tests for `value_passes_filter_list`."""
+
+    def test_nothing_passes_empty_list(self):
+        self.assertFalse(
+            boot_resources.value_passes_filter_list(
+                [], factory.make_name('value')))
+
+    def test_unmatched_value_does_not_pass(self):
+        self.assertFalse(
+            boot_resources.value_passes_filter_list(
+                [factory.make_name('filter')], factory.make_name('value')))
+
+    def test_matched_value_passes(self):
+        value = factory.make_name('value')
+        self.assertTrue(
+            boot_resources.value_passes_filter_list([value], value))
+
+    def test_value_passes_if_matched_anywhere_in_filter(self):
+        value = factory.make_name('value')
+        self.assertTrue(
+            boot_resources.value_passes_filter_list(
+                [
+                    factory.make_name('filter'),
+                    value,
+                    factory.make_name('filter'),
+                ],
+                value))
+
+    def test_any_value_passes_asterisk(self):
+        self.assertTrue(
+            boot_resources.value_passes_filter_list(
+                ['*'], factory.make_name('value')))
+
+
+class TestValuePassesFilter(MAASTestCase):
+    """Tests for `value_passes_filter`."""
+
+    def test_unmatched_value_does_not_pass(self):
+        self.assertFalse(
+            boot_resources.value_passes_filter(
+                factory.make_name('filter'), factory.make_name('value')))
+
+    def test_matching_value_passes(self):
+        value = factory.make_name('value')
+        self.assertTrue(boot_resources.value_passes_filter(value, value))
+
+    def test_any_value_matches_asterisk(self):
+        self.assertTrue(
+            boot_resources.value_passes_filter(
+                '*', factory.make_name('value')))
+
+
+class TestImagePassesFilter(MAASTestCase):
+    """Tests for `image_passes_filter`."""
+
+    def make_filter_from_image(self, image_spec=None):
+        """Create a filter dict that matches the given `ImageSpec`.
+
+        If `image_spec` is not given, creates a random value.
+        """
+        if image_spec is None:
+            image_spec = make_image_spec()
+        return {
+            'arches': [image_spec.arch],
+            'subarches': [image_spec.subarch],
+            'release': image_spec.release,
+            'labels': [image_spec.label],
+            }
+
+    def test_any_image_passes_none_filter(self):
+        arch, subarch, release, label = make_image_spec()
+        self.assertTrue(
+            boot_resources.image_passes_filter(
+                None, arch, subarch, release, label))
+
+    def test_any_image_passes_empty_filter(self):
+        arch, subarch, release, label = make_image_spec()
+        self.assertTrue(
+            boot_resources.image_passes_filter(
+                [], arch, subarch, release, label))
+
+    def test_image_passes_matching_filter(self):
+        image = make_image_spec()
+        self.assertTrue(
+            boot_resources.image_passes_filter(
+                [self.make_filter_from_image(image)],
+                image.arch, image.subarch, image.release, image.label))
+
+    def test_image_does_not_pass_nonmatching_filter(self):
+        image = make_image_spec()
+        self.assertFalse(
+            boot_resources.image_passes_filter(
+                [self.make_filter_from_image()],
+                image.arch, image.subarch, image.release, image.label))
+
+    def test_image_passes_if_one_filter_matches(self):
+        image = make_image_spec()
+        self.assertTrue(
+            boot_resources.image_passes_filter(
+                [
+                    self.make_filter_from_image(),
+                    self.make_filter_from_image(image),
+                    self.make_filter_from_image(),
+                ], image.arch, image.subarch, image.release, image.label))
+
+    def test_filter_checks_release(self):
+        image = make_image_spec()
+        self.assertFalse(
+            boot_resources.image_passes_filter(
+                [
+                    self.make_filter_from_image(image._replace(
+                        release=factory.make_name('other-release')))
+                ], image.arch, image.subarch, image.release, image.label))
+
+    def test_filter_checks_arches(self):
+        image = make_image_spec()
+        self.assertFalse(
+            boot_resources.image_passes_filter(
+                [
+                    self.make_filter_from_image(image._replace(
+                        arch=factory.make_name('other-arch')))
+                ], image.arch, image.subarch, image.release, image.label))
+
+    def test_filter_checks_subarches(self):
+        image = make_image_spec()
+        self.assertFalse(
+            boot_resources.image_passes_filter(
+                [
+                    self.make_filter_from_image(image._replace(
+                        subarch=factory.make_name('other-subarch')))
+                ], image.arch, image.subarch, image.release, image.label))
+
+    def test_filter_checks_labels(self):
+        image = make_image_spec()
+        self.assertFalse(
+            boot_resources.image_passes_filter(
+                [
+                    self.make_filter_from_image(image._replace(
+                        label=factory.make_name('other-label')))
+                ], image.arch, image.subarch, image.release, image.label))
+
+
+class TestBootMerge(MAASTestCase):
+    """Tests for `boot_merge`."""
+
+    def make_resource(self, boot_dict=None, image_spec=None, resource=None):
+        """Add a boot resource to `boot_dict`, creating it if necessary."""
+        if boot_dict is None:
+            boot_dict = {}
+        if image_spec is None:
+            image_spec = make_image_spec()
+        if resource is None:
+            resource = factory.make_name('boot-resource')
+        arch, subarch, release, label = image_spec
+        # Drill down into the dict; along the way, create any missing levels of
+        # nested dicts.
+        nested_dict = boot_dict
+        for level in (arch, subarch, release):
+            nested_dict.setdefault(level, {})
+            nested_dict = nested_dict[level]
+        # At the bottom level, indexed by "label," insert "resource" as the
+        # value.
+        nested_dict[label] = resource
+        return boot_dict
+
+    def test_integrates(self):
+        # End-to-end scenario for boot_merge: start with an empty boot
+        # resources dict, and receive one resource from Simplestreams.
+        total_resources = boot_resources.create_empty_hierarchy()
+        resources_from_repo = self.make_resource()
+        boot_resources.boot_merge(total_resources, resources_from_repo.copy())
+        # Since we started with an empty dict, the result contains the same
+        # item that we got from Simplestreams, and nothing else.
+        self.assertEqual(resources_from_repo, total_resources)
+
+    def test_obeys_filters(self):
+        filters = [
+            {
+                'arches': [factory.make_name('other-arch')],
+                'subarches': [factory.make_name('other-subarch')],
+                'release': factory.make_name('other-release'),
+                'label': [factory.make_name('other-label')],
+            },
+            ]
+        total_resources = boot_resources.create_empty_hierarchy()
+        resources_from_repo = self.make_resource()
+        boot_resources.boot_merge(
+            total_resources, resources_from_repo, filters=filters)
+        self.assertEqual({}, total_resources)
+
+    def test_does_not_overwrite_existing_entry(self):
+        image = make_image_spec()
+        original_resources = self.make_resource(
+            resource="Original resource", image_spec=image)
+        total_resources = original_resources.copy()
+        resources_from_repo = self.make_resource(
+            resource="New resource", image_spec=image)
+        boot_resources.boot_merge(total_resources, resources_from_repo.copy())
+        self.assertEqual(original_resources, total_resources)
+
+
+>>>>>>> MERGE-SOURCE
 class TestMain(MAASTestCase):
 
+<<<<<<< TREE
     def patch_logger(self):
         """Suppress log output from the import code."""
         self.patch(boot_resources, 'logger')
@@ -343,23 +580,28 @@
                 "No boot resources found.  "
                 "Check configuration and connectivity."))
 
+=======
+>>>>>>> MERGE-SOURCE
     def test_raises_ioerror_when_no_config_file_found(self):
-        self.patch_logger()
-        no_config = os.path.join(
-            self.make_dir(), '%s.yaml' % factory.make_name('no-config'))
+        # Suppress log output.
+        self.logger = self.patch(boot_resources, 'logger')
+        filename = "/tmp/%s" % factory.make_name("config")
+        self.assertFalse(os.path.exists(filename))
+        args = MagicMock()
+        args.config_file = filename
         self.assertRaises(
             boot_resources.NoConfigFile,
-            boot_resources.main, self.make_args(config_file=no_config))
+            boot_resources.main, args)
 
     def test_raises_non_ENOENT_IOErrors(self):
         # main() will raise a NoConfigFile error when it encounters an
         # ENOENT IOError, but will otherwise just re-raise the original
         # IOError.
+        args = MagicMock()
         mock_load_from_cache = self.patch(BootConfig, 'load_from_cache')
         other_error = IOError(randint(errno.ENOENT + 1, 1000))
         mock_load_from_cache.side_effect = other_error
-        self.patch_logger()
-        raised_error = self.assertRaises(
-            IOError,
-            boot_resources.main, self.make_args())
+        # Suppress log output.
+        self.logger = self.patch(boot_resources, 'logger')
+        raised_error = self.assertRaises(IOError, boot_resources.main, args)
         self.assertEqual(other_error, raised_error)

=== modified file 'src/provisioningserver/power_schema.py'
=== modified file 'src/provisioningserver/tasks.py'
=== modified file 'src/provisioningserver/tests/test_tasks.py'
--- src/provisioningserver/tests/test_tasks.py	2014-05-05 18:51:41 +0000
+++ src/provisioningserver/tests/test_tasks.py	2014-05-09 20:33:59 +0000
@@ -676,6 +676,7 @@
         self.patch_boot_resources_function()
         mock_callback = Mock()
         import_boot_images(callback=mock_callback)
+<<<<<<< TREE
         self.assertThat(mock_callback.delay, MockCalledOnceWith())
 
 
@@ -688,3 +689,17 @@
         mock = self.patch(tasks, 'probe_and_enlist_ucsm')
         enlist_nodes_from_ucsm(url, username, password)
         self.assertThat(mock, MockCalledOnceWith(url, username, password))
+=======
+        self.assertEqual([call()], mock_callback.delay.mock_calls)
+
+
+class TestAddUCSM(PservTestCase):
+
+    def test_enlist_nodes_from_ucsm(self):
+        url = 'url'
+        username = 'username'
+        password = 'password'
+        mock = self.patch(tasks, 'probe_and_enlist_ucsm')
+        enlist_nodes_from_ucsm(url, username, password)
+        self.assertThat(mock, MockCalledOnceWith(url, username, password))
+>>>>>>> MERGE-SOURCE

=== modified file 'src/provisioningserver/utils/__init__.py'
=== modified file 'src/provisioningserver/utils/tests/test_utils.py'