Merge lp:~dimitern/maas/1.2-node-view-shows-kernel-params into lp:~maas-committers/maas/trunk

[Dimiter Naydenov]

I'd like to request a UI review for the changes I'm about to make to show kernel boot parameters in the node view, tag view and settings page.

http://people.canonical.com/~dimitern/maas-node-view-kernel-opts-tag.png
http://people.canonical.com/~dimitern/maas-node-view-kernel-opts-global.png
http://people.canonical.com/~dimitern/maas-tag-view-kernel-opts.png
-http://people.canonical.com/~dimitern/maas-settings-global-kernel-opts.png-

Edit: instead of the last link, use this (single line, as suggested):
http://people.canonical.com/~dimitern/maas-settings-kernel-opts.png

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 11/5/2012 7:26 PM, Dimiter Naydenov wrote:
> Dimiter Naydenov has proposed merging
> lp:~dimitern/maas/1.2-node-view-shows-kernel-params into lp:maas.
>
> Requested reviews: Huw Wilkins (huwshimi): ui Related bugs: Bug
> #1044503 in MAAS: "kernel command line is not easily customizable"
> https://bugs.launchpad.net/maas/+bug/1044503
>
> For more details, see:
> https://code.launchpad.net/~dimitern/maas/1.2-node-view-shows-kernel-params/+merge/132911
>
> I'd like to request a UI review for the changes I'm about to make
> to show kernel boot parameters in the node view, tag view and
> settings page.
>
> http://people.canonical.com/~dimitern/maas-node-view-kernel-opts-tag.png
>
>
http://people.canonical.com/~dimitern/maas-node-view-kernel-opts-global.png
> http://people.canonical.com/~dimitern/maas-tag-view-kernel-opts.png
>
>
http://people.canonical.com/~dimitern/maas-settings-global-kernel-opts.png
>

- From my PoV, the only one I would change is probably making the global
parameter entry box a single line box, just extra wide, rather than
multiline. Though I'm not set on that.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (Cygwin)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iEYEARECAAYFAlCX4UAACgkQJdeBCYSNAAMMdQCfRNFY5QAegoULhXQzY+VhLyx4
8isAoJEnHffo8/FA0JuTFI6XcKMVMna8
=lx+H
-----END PGP SIGNATURE-----

[Nick Veitch (evilnick)]

>http://people.canonical.com/~dimitern/maas-settings-global-kernel-opts.png

yeah, this one takes up quite a bit of vertical space on a page which is only going to get bigger - wider and shorter is the way to go...

Nick

[Martin Packman (gz)]

View and template changes look good, though the real branch will want proposing against lp:maas/1.2 rather than trunk.

[Dimiter Naydenov (dimitern)]

Thanks for the review and comments. I did the changes needed and now I'm rejecting this MP and recreating it, since it targets trunk, rather than 1.2.

=== modified file 'etc/celeryconfig_common.py'
=== modified file 'src/maasserver/api.py'
=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2012-11-01 15:13:10 +0000
+++ src/maasserver/forms.py	2012-11-07 10:56:25 +0000
@@ -394,6 +394,7 @@
         node.save()
         for mac in self.cleaned_data['mac_addresses']:
             node.add_mac_address(mac)
+<<<<<<< TREE
         hostname = self.cleaned_data['hostname']
         stripped_hostname = strip_domain(hostname)
         # Generate a hostname for this node if the provided hostname is
@@ -404,6 +405,18 @@
             IP_BASED_HOSTNAME_REGEXP.match(stripped_hostname) != None)
         if generate_hostname:
             node.set_random_hostname()
+=======
+        hostname = self.cleaned_data['hostname']
+        stripped_hostname = strip_domain(hostname)
+        # Generate a hostname for this node if the provided hostname is
+        # IP-based (because this means that this name comes from a DNS
+        # reverse query to the MAAS DNS) or an empty string.
+        generate_hostname = (
+            hostname == "" or
+            IP_BASED_HOSTNAME_REGEXP.match(stripped_hostname) != None)
+        if generate_hostname:
+            node.set_mac_based_hostname(self.cleaned_data['mac_addresses'][0])
+>>>>>>> MERGE-SOURCE
         return node
 
 
@@ -646,6 +659,13 @@
         self._load_initials()
 
 
+class GlobalKernelOptsForm(ConfigForm):
+    """Settings page, Global Kernel Parameters section."""
+    global_kernel_opts = forms.CharField(
+        label="Boot parameters to pass to the kernel by default",
+        required=False)
+
+
 hostname_error_msg = "Enter a valid hostname (e.g. host.example.com)."
 
 

=== modified file 'src/maasserver/models/node.py'
=== modified file 'src/maasserver/static/css/components/blocks.css'
--- src/maasserver/static/css/components/blocks.css	2012-10-03 03:59:53 +0000
+++ src/maasserver/static/css/components/blocks.css	2012-11-07 10:56:25 +0000
@@ -82,3 +82,6 @@
 .size12 {
     width: 720px;
     }
+.size12 input {
+    width: 100%;
+    }

=== modified file 'src/maasserver/templates/maasserver/form_field.html'
--- src/maasserver/templates/maasserver/form_field.html	2012-08-03 16:36:26 +0000
+++ src/maasserver/templates/maasserver/form_field.html	2012-11-07 10:56:25 +0000
@@ -1,5 +1,5 @@
 {% load field_type %}
-<li class="{{ field.html_name }}{% if field.errors %} error{% endif %}">
+<li class="{{ field.html_name }}{% if css_class %} {{ css_class }}{% endif %}{% if field.errors %} error{% endif %}">
   <label for="id_{{ field.html_name }}">
     {% ifequal field|field_type "CheckboxInput" %}
       {{ field }}

=== modified file 'src/maasserver/templates/maasserver/node_list.html'
--- src/maasserver/templates/maasserver/node_list.html	2012-10-24 12:51:10 +0000
+++ src/maasserver/templates/maasserver/node_list.html	2012-11-07 10:56:25 +0000
@@ -38,8 +38,13 @@
     {% if input_query_error %}
     <p class="form-errors">{{input_query_error}}</p>
     {% endif %}
+<<<<<<< TREE
     {% include "maasserver/nodes_listing.html" with sorting="true" %}
     {% include "maasserver/pagination.html" %}
+=======
+    {% include "maasserver/nodes_listing.html" %}
+    {% include "maasserver/pagination.html" %}
+>>>>>>> MERGE-SOURCE
     <a id="addnode" href="#" class="button right space-top">+ Add node</a>
     <div class="clear"></div>
     <a class="right space-top" href="{% url "enlist-preseed-view" %}">View enlistment preseed</a>

=== modified file 'src/maasserver/templates/maasserver/node_view.html'
--- src/maasserver/templates/maasserver/node_view.html	2012-10-05 17:42:12 +0000
+++ src/maasserver/templates/maasserver/node_view.html	2012-11-07 10:56:25 +0000
@@ -85,6 +85,18 @@
           {% endif %}
       </span>
     </li>
+    <li class="block size10 first">
+      <h4>Kernel Parameters
+        {% if kernel_opts.is_global %}
+        - from: <a href="{% url 'settings' %}">Global Kernel Parameters</a>
+        {% elif kernel_opts.is_tag %}
+        - from tag: <span><a href="{% url 'tag-view' kernel_opts.tag.name %}">{{ kernel_opts.tag.name }}</a></span>
+        {% endif %}
+      </h4>
+      <span id="node_kernel_opts">
+        {{ kernel_opts.value }}
+      </span>
+    </li>
     {% if error_text %}
     <li class="block first">
       <h4>Error output</h4>

=== modified file 'src/maasserver/templates/maasserver/settings.html'
--- src/maasserver/templates/maasserver/settings.html	2012-10-04 07:50:22 +0000
+++ src/maasserver/templates/maasserver/settings.html	2012-11-07 10:56:25 +0000
@@ -125,6 +125,21 @@
       <div class="clear"></div>
     </div>
     <div class="divider"></div>
+    <div id="global_kernel_opts" class="block size7 first">
+      <h2>Global Kernel Parameters</h2>
+      <form action="{% url "settings" %}" method="post">
+        {% csrf_token %}
+        <ul>
+          {% with field=kernelopts_form.global_kernel_opts %}
+            {% include "maasserver/form_field.html" with css_class="size12" %}
+          {% endwith %}
+        </ul>
+        <input type="hidden" name="kernelopts_submit" value="1" />
+        <input type="submit" class="button right" value="Save" />
+      </form>
+      <div class="clear"></div>
+    </div>
+    <div class="divider"></div>
     <div id="maas_and_network" class="block size7 first">
       <h2>Network Configuration</h2>
       <form action="{% url "settings" %}" method="post">

=== modified file 'src/maasserver/templates/maasserver/tag_view.html'
--- src/maasserver/templates/maasserver/tag_view.html	2012-10-24 12:51:10 +0000
+++ src/maasserver/templates/maasserver/tag_view.html	2012-11-07 10:56:25 +0000
@@ -19,6 +19,12 @@
       <h4>Definition</h4>
       <span>{{ tag.definition }}</span>
     </li>
+    {% if tag.kernel_params %}
+    <li class="block size10">
+      <h4>Kernel Parameters</h4>
+      <span>{{ tag.kernel_params }}</span>
+    </li>
+    {% endif %}
     {% if error_text %}
     <li class="block first">
       <h4>Error output</h4>

=== modified file 'src/maasserver/testing/factory.py'
=== modified file 'src/maasserver/tests/test_api.py'
--- src/maasserver/tests/test_api.py	2012-11-06 18:35:35 +0000
+++ src/maasserver/tests/test_api.py	2012-11-07 10:56:25 +0000
@@ -4267,6 +4267,7 @@
             (response.status_code, response.content))
 
     def test_report_boot_images_warns_if_no_images_found(self):
+<<<<<<< TREE
         nodegroup = NodeGroup.objects.ensure_master()
         factory.make_node_group()  # Second nodegroup with no images.
         recorder = self.patch(api, 'register_persistent_error')
@@ -4310,6 +4311,50 @@
         response = self.report_images(nodegroup, [image], client=client)
         self.assertEqual(httplib.OK, response.status_code)
         self.assertEqual(0, recorder.call_count)
+=======
+        nodegroup = NodeGroup.objects.ensure_master()
+        factory.make_node_group()  # Second nodegroup with no images.
+        recorder = self.patch(api, 'register_persistent_error')
+        client = make_worker_client(nodegroup)
+        response = self.report_images(nodegroup, [], client=client)
+        self.assertEqual(
+            (httplib.OK, "OK"),
+            (response.status_code, response.content))
+
+        self.assertIn(
+            COMPONENT.IMPORT_PXE_FILES,
+            [args[0][0] for args in recorder.call_args_list])
+        # Check that the persistent error message contains a link to the
+        # clusters listing.
+        self.assertIn(
+            "/settings/#accepted-clusters", recorder.call_args_list[0][0][1])
+
+    def test_report_boot_images_warns_if_any_nodegroup_has_no_images(self):
+        nodegroup = NodeGroup.objects.ensure_master()
+        # Second nodegroup with no images.
+        factory.make_node_group(status=NODEGROUP_STATUS.ACCEPTED)
+        recorder = self.patch(api, 'register_persistent_error')
+        client = make_worker_client(nodegroup)
+        image = make_boot_image_params()
+        response = self.report_images(nodegroup, [image], client=client)
+        self.assertEqual(
+            (httplib.OK, "OK"),
+            (response.status_code, response.content))
+
+        self.assertIn(
+            COMPONENT.IMPORT_PXE_FILES,
+            [args[0][0] for args in recorder.call_args_list])
+
+    def test_report_boot_images_ignores_non_accepted_groups(self):
+        nodegroup = factory.make_node_group(status=NODEGROUP_STATUS.ACCEPTED)
+        factory.make_node_group(status=NODEGROUP_STATUS.PENDING)
+        factory.make_node_group(status=NODEGROUP_STATUS.REJECTED)
+        recorder = self.patch(api, 'register_persistent_error')
+        client = make_worker_client(nodegroup)
+        image = make_boot_image_params()
+        response = self.report_images(nodegroup, [image], client=client)
+        self.assertEqual(0, recorder.call_count)
+>>>>>>> MERGE-SOURCE
 
     def test_report_boot_images_removes_warning_if_images_found(self):
         self.patch(api, 'register_persistent_error')

=== modified file 'src/maasserver/tests/test_dhcplease.py'
=== modified file 'src/maasserver/tests/test_forms.py'
--- src/maasserver/tests/test_forms.py	2012-11-01 11:11:48 +0000
+++ src/maasserver/tests/test_forms.py	2012-11-07 10:56:25 +0000
@@ -350,36 +350,81 @@
             after_commissioning_action, node.after_commissioning_action)
         self.assertEqual(power_type, node.power_type)
 
-    def test_AdminNodeForm_refuses_to_update_hostname_on_allocated_node(self):
-        old_name = factory.make_name('old-hostname')
-        new_name = factory.make_name('new-hostname')
-        node = factory.make_node(
-            hostname=old_name, status=NODE_STATUS.ALLOCATED)
-        form = AdminNodeForm(
-            data={
-                'hostname': new_name,
-                'architecture': node.architecture,
-                },
-            instance=node)
-        self.assertFalse(form.is_valid())
-        self.assertEqual(
-            ["Can't change hostname to %s: node is in use." % new_name],
-            form._errors['hostname'])
-
-    def test_AdminNodeForm_accepts_unchanged_hostname_on_allocated_node(self):
-        old_name = factory.make_name('old-hostname')
-        node = factory.make_node(
-            hostname=old_name, status=NODE_STATUS.ALLOCATED)
-        form = AdminNodeForm(
-            data={
-                'hostname': old_name,
-                'architecture': node.architecture,
-            },
-            instance=node)
-        self.assertTrue(form.is_valid(), form._errors)
-        form.save()
-        self.assertEqual(old_name, reload_object(node).hostname)
-
+<<<<<<< TREE
+    def test_AdminNodeForm_refuses_to_update_hostname_on_allocated_node(self):
+        old_name = factory.make_name('old-hostname')
+        new_name = factory.make_name('new-hostname')
+        node = factory.make_node(
+            hostname=old_name, status=NODE_STATUS.ALLOCATED)
+        form = AdminNodeForm(
+            data={
+                'hostname': new_name,
+                'architecture': node.architecture,
+                },
+            instance=node)
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            ["Can't change hostname to %s: node is in use." % new_name],
+            form._errors['hostname'])
+
+    def test_AdminNodeForm_accepts_unchanged_hostname_on_allocated_node(self):
+        old_name = factory.make_name('old-hostname')
+        node = factory.make_node(
+            hostname=old_name, status=NODE_STATUS.ALLOCATED)
+        form = AdminNodeForm(
+            data={
+                'hostname': old_name,
+                'architecture': node.architecture,
+            },
+            instance=node)
+        self.assertTrue(form.is_valid(), form._errors)
+        form.save()
+        self.assertEqual(old_name, reload_object(node).hostname)
+
+=======
+    def test_AdminNodeForm_refuses_to_update_hostname_on_allocated_node(self):
+        old_name = factory.make_name('old-hostname')
+        new_name = factory.make_name('new-hostname')
+        node = factory.make_node(
+            hostname=old_name, status=NODE_STATUS.ALLOCATED)
+        form = AdminNodeForm(
+            data={
+                'hostname': new_name,
+                'architecture': node.architecture,
+                },
+            instance=node)
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            ["Can't change hostname to %s: node is in use." % new_name],
+            form._errors['hostname'])
+
+    def test_AdminNodeForm_accepts_unchanged_hostname_on_allocated_node(self):
+        old_name = factory.make_name('old-hostname')
+        node = factory.make_node(
+            hostname=old_name, status=NODE_STATUS.ALLOCATED)
+        form = AdminNodeForm(
+            data={
+                'hostname': old_name,
+                'architecture': node.architecture,
+            },
+            instance=node)
+        self.assertTrue(form.is_valid(), form._errors)
+        form.save()
+        self.assertEqual(old_name, reload_object(node).hostname)
+
+    def test_AdminNodeForm_accepts_omitted_hostname_on_allocated_node(self):
+        node = factory.make_node(status=NODE_STATUS.ALLOCATED)
+        old_name = node.hostname
+        form = AdminNodeForm(
+            data={
+                'architecture': node.architecture,
+                },
+            instance=node)
+        self.assertTrue(form.is_valid())
+        form.save()
+        self.assertEqual(old_name, reload_object(node).hostname)
+
+>>>>>>> MERGE-SOURCE
     def test_remove_None_values_removes_None_values_in_dict(self):
         random_input = factory.getRandomString()
         self.assertEqual(

=== modified file 'src/maasserver/tests/test_node.py'
=== modified file 'src/maasserver/tests/test_views_nodes.py'
--- src/maasserver/tests/test_views_nodes.py	2012-11-01 15:59:22 +0000
+++ src/maasserver/tests/test_views_nodes.py	2012-11-07 10:56:25 +0000
@@ -532,6 +532,7 @@
             "//div[@id='nodes']/table//td/a/@href")
         self.assertEqual([node2_link], node_links)
 
+<<<<<<< TREE
     def test_node_list_paginates(self):
         """Node listing is split across multiple pages with links"""
         # Set a very small page size to save creating lots of nodes
@@ -591,6 +592,65 @@
             [(a.text.lower(), a.get("href"))
                 for a in document.xpath("//div[@class='pagination']//a")])
 
+=======
+    def test_node_list_paginates(self):
+        """Node listing is split across multiple pages with links"""
+        # Set a very small page size to save creating lots of nodes
+        page_size = 2
+        self.patch(nodes_views.NodeListView, 'paginate_by', page_size)
+        nodes = [factory.make_node(created="2012-10-12 12:00:%02d" % i)
+            for i in range(page_size * 2 + 1)]
+        # Order node links with newest first as the view is expected to
+        node_links = [reverse('node-view', args=[node.system_id])
+            for node in reversed(nodes)]
+        expr_node_links = XPath("//div[@id='nodes']/table//a/@href")
+        expr_page_anchors = XPath("//div[@class='pagination']//a")
+        # Fetch first page, should link newest two nodes and page 2
+        response = self.client.get(reverse('node-list'))
+        page1 = fromstring(response.content)
+        self.assertEqual(node_links[:page_size], expr_node_links(page1))
+        self.assertEqual([("next", "?page=2"), ("last", "?page=3")],
+            [(a.text.lower(), a.get("href"))
+                for a in expr_page_anchors(page1)])
+        # Fetch second page, should link next nodes and adjacent pages
+        response = self.client.get(reverse('node-list'), {"page": 2})
+        page2 = fromstring(response.content)
+        self.assertEqual(node_links[page_size:page_size * 2],
+            expr_node_links(page2))
+        self.assertEqual([("first", "."), ("previous", "."),
+                ("next", "?page=3"), ("last", "?page=3")],
+            [(a.text.lower(), a.get("href"))
+                for a in expr_page_anchors(page2)])
+        # Fetch third page, should link oldest node and node list page
+        response = self.client.get(reverse('node-list'), {"page": 3})
+        page3 = fromstring(response.content)
+        self.assertEqual(node_links[page_size * 2:], expr_node_links(page3))
+        self.assertEqual([("first", "."), ("previous", "?page=2")],
+            [(a.text.lower(), a.get("href"))
+                for a in expr_page_anchors(page3)])
+
+    def test_node_list_query_paginates(self):
+        """Node list query subset is split across multiple pages with links"""
+        # Set a very small page size to save creating lots of nodes
+        self.patch(nodes_views.NodeListView, 'paginate_by', 2)
+        nodes = [factory.make_node(created="2012-10-12 12:00:%02d" % i)
+            for i in range(10)]
+        tag = factory.make_tag("odd")
+        for node in nodes[::2]:
+            node.tags = [tag]
+        last_node_link = reverse('node-view', args=[nodes[0].system_id])
+        response = self.client.get(reverse('node-list'),
+            {"query": "maas-tags=odd", "page": 3})
+        document = fromstring(response.content)
+        self.assertIn("5 matching nodes", document.xpath("string(//h1)"))
+        self.assertEqual([last_node_link],
+            document.xpath("//div[@id='nodes']/table//a/@href"))
+        self.assertEqual([("first", "?query=maas-tags%3Dodd"),
+                ("previous", "?query=maas-tags%3Dodd&page=2")],
+            [(a.text.lower(), a.get("href"))
+                for a in document.xpath("//div[@class='pagination']//a")])
+
+>>>>>>> MERGE-SOURCE
 
 class NodePreseedViewTest(LoggedInTestCase):
 

=== modified file 'src/maasserver/views/nodes.py'
--- src/maasserver/views/nodes.py	2012-10-24 15:57:18 +0000
+++ src/maasserver/views/nodes.py	2012-11-07 10:56:25 +0000
@@ -56,6 +56,7 @@
 from maasserver.models import (
     MACAddress,
     Node,
+    Tag,
     )
 from maasserver.models.node import CONSTRAINTS_JUJU_MAP
 from maasserver.models.node_constraint_filter import constrain_nodes
@@ -245,6 +246,13 @@
             node.error if node.status == NODE_STATUS.FAILED_TESTS else None)
         context['status_text'] = (
             node.error if node.status != NODE_STATUS.FAILED_TESTS else None)
+        kernel_opts = node.get_effective_kernel_options()
+        context['kernel_opts'] = {
+            'is_global': kernel_opts[0] is None,
+            'is_tag': isinstance(kernel_opts[0], Tag),
+            'tag': kernel_opts[0],
+            'value': kernel_opts[1]
+            }
         return context
 
     def dispatch(self, *args, **kwargs):

=== modified file 'src/maasserver/views/settings.py'
--- src/maasserver/views/settings.py	2012-10-03 15:48:11 +0000
+++ src/maasserver/views/settings.py	2012-11-07 10:56:25 +0000
@@ -46,6 +46,7 @@
     MAASAndNetworkForm,
     NewUserCreationForm,
     UbuntuForm,
+    GlobalKernelOptsForm,
     )
 from maasserver.models import (
     NodeGroup,
@@ -177,6 +178,13 @@
     if response is not None:
         return response
 
+    # Process the Global Kernel Opts form.
+    kernelopts_form, response = process_form(
+        request, GlobalKernelOptsForm, reverse('settings'), 'kernelopts',
+        "Configuration updated.")
+    if response is not None:
+        return response
+
     # Process accept clusters en masse.
     if 'mass_accept_submit' in request.POST:
         number = NodeGroup.objects.accept_all_pending()
@@ -207,6 +215,7 @@
             'maas_and_network_form': maas_and_network_form,
             'commissioning_form': commissioning_form,
             'ubuntu_form': ubuntu_form,
+            'kernelopts_form': kernelopts_form,
         },
         context_instance=RequestContext(request))
 

=== modified file 'src/provisioningserver/boot_images.py'
--- src/provisioningserver/boot_images.py	2012-10-25 07:27:24 +0000
+++ src/provisioningserver/boot_images.py	2012-11-07 10:56:25 +0000
@@ -32,10 +32,14 @@
     )
 from provisioningserver.config import Config
 from provisioningserver.pxe import tftppath
+<<<<<<< TREE
 from provisioningserver.start_cluster_controller import get_cluster_uuid
 
 
 task_logger = get_task_logger(name=__name__)
+=======
+from provisioningserver.start_cluster_controller import get_cluster_uuid
+>>>>>>> MERGE-SOURCE
 
 
 def get_cached_knowledge():

=== modified file 'src/provisioningserver/dns/config.py'
=== modified file 'src/provisioningserver/dns/tests/test_config.py'
=== modified file 'src/provisioningserver/tasks.py'
--- src/provisioningserver/tasks.py	2012-11-05 11:54:01 +0000
+++ src/provisioningserver/tasks.py	2012-11-07 10:56:25 +0000
@@ -369,6 +369,7 @@
                 exc=exc, countdown=UPDATE_NODE_TAGS_RETRY_DELAY)
         else:
             raise
+<<<<<<< TREE
 
 
 # =====================================================================
@@ -382,3 +383,18 @@
         env['http_proxy'] = http_proxy
         env['https_proxy'] = http_proxy
     check_call(['sudo', '-n', 'maas-import-pxe-files'], env=env)
+=======
+
+
+# =====================================================================
+# Image importing-related tasks
+# =====================================================================
+
+@task
+def import_pxe_files(http_proxy=None):
+    env = dict(os.environ)
+    if http_proxy is not None:
+        env['http_proxy'] = http_proxy
+        env['https_proxy'] = http_proxy
+    check_call(['maas-import-pxe-files'], env=env)
+>>>>>>> MERGE-SOURCE

=== modified file 'src/provisioningserver/tests/test_tasks.py'
--- src/provisioningserver/tests/test_tasks.py	2012-11-05 11:54:01 +0000
+++ src/provisioningserver/tests/test_tasks.py	2012-11-07 10:56:25 +0000
@@ -536,6 +536,7 @@
         self.assertRaises(
             MissingCredentials, update_node_tags.delay, tag,
             '//node', retry=True)
+<<<<<<< TREE
 
 
 class TestImportPxeFiles(PservTestCase):
@@ -560,3 +561,28 @@
         expected_env = dict(os.environ, http_proxy=proxy, https_proxy=proxy)
         recorder.assert_called_once_with(
             ['sudo', '-n', 'maas-import-pxe-files'], env=expected_env)
+=======
+
+
+class TestImportPxeFiles(PservTestCase):
+
+    def test_import_pxe_files(self):
+        recorder = self.patch(tasks, 'check_call', Mock())
+        import_pxe_files()
+        recorder.assert_called_once_with(['maas-import-pxe-files'], env=ANY)
+        self.assertIsInstance(import_pxe_files, Task)
+
+    def test_import_pxe_files_preserves_environment(self):
+        recorder = self.patch(tasks, 'check_call', Mock())
+        import_pxe_files()
+        recorder.assert_called_once_with(
+            ['maas-import-pxe-files'], env=os.environ)
+
+    def test_import_pxe_files_sets_proxy(self):
+        recorder = self.patch(tasks, 'check_call', Mock())
+        proxy = factory.getRandomString()
+        import_pxe_files(http_proxy=proxy)
+        expected_env = dict(os.environ, http_proxy=proxy, https_proxy=proxy)
+        recorder.assert_called_once_with(
+            ['maas-import-pxe-files'], env=expected_env)
+>>>>>>> MERGE-SOURCE