Merge lp:~rvb/maas/di-api-bug-1456969-1.7 into lp:maas/1.7

[Raphaël Badin]

Backport 3921: Expose the 'boot_type' field on the API. This controls whether the node will use curtin or di to install itself. The di installation is deprecated but before we fully support advanced networking and storage configuration in curtin, we still have to support di.

[Blake Rouse (blake-rouse)]

review: Approve

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2015-05-21 17:35:36 +0000
+++ docs/changelog.rst	2015-05-26 16:37:00 +0000
@@ -2,6 +2,15 @@
 Changelog
 =========
 
+1.7.5
+=====
+
+Bug Fix Update
+--------------
+
+#1456969    MAAS cli/API: missing option set use-fast-installer /
+            use-debian-installer
+
 1.7.4
 =====
 
 
=== modified file 'src/maasserver/api/nodes.py'
--- src/maasserver/api/nodes.py	2015-03-06 18:23:33 +0000
+++ src/maasserver/api/nodes.py	2015-05-26 16:37:00 +0000
@@ -100,6 +100,7 @@
     'substatus',
     'osystem',
     'distro_series',
+    'boot_type',
     'netboot',
     'power_type',
     'power_state',
@@ -235,6 +236,11 @@
         :type power_parameters_skip_check: unicode
         :param zone: Name of a valid physical zone in which to place this node
         :type zone: unicode
+        :param boot_type: The installation type of the node. 'fastpath': use
+            the default installer. 'di' use the debian installer.
+            Note that using 'di' is now deprecated and will be removed in favor
+            of the default installer in MAAS 1.9.
+        :type boot_type: unicode
 
         Returns 404 if the node is node found.
         Returns 403 if the user does not have permission to update the node.
@@ -243,7 +249,6 @@
             system_id=system_id, user=request.user, perm=NODE_PERMISSION.EDIT)
         Form = get_node_edit_form(request.user)
         form = Form(data=request.data, instance=node)
-
         if form.is_valid():
             return form.save()
         else:
@@ -689,6 +694,11 @@
         and re-install its operating system.  In anonymous enlistment and when
         the enlistment is done by a non-admin, the node is held in the
         "New" state for approval by a MAAS admin.
+        :param boot_type: The installation type of the node. 'fastpath': use
+            the default installer. 'di' use the debian installer.
+            Note that using 'di' is now deprecated and will be removed in favor
+            of the default installer in MAAS 1.9.
+        :type boot_type: unicode
         """
         # XXX 2014-02-11 bug=1278685
         # There's no documentation here on what parameters can be passed!
 
=== modified file 'src/maasserver/api/tests/test_enlistment.py'
--- src/maasserver/api/tests/test_enlistment.py	2014-12-02 16:47:25 +0000
+++ src/maasserver/api/tests/test_enlistment.py	2015-05-26 16:37:00 +0000
@@ -479,7 +479,7 @@
                 'architecture': make_usable_architecture(self),
                 'mac_addresses': ['aa:bb:cc:dd:ee:ff'],
             })
-        self.assertEqual(httplib.OK, response.status_code)
+        self.assertEqual(httplib.OK, response.status_code, response.content)
         system_id = json.loads(response.content)['system_id']
         self.assertEqual(
             NODE_STATUS.NEW,
@@ -526,6 +526,7 @@
                 'osystem',
                 'distro_series',
                 'netboot',
+                'boot_type',
                 'power_type',
                 'power_state',
                 'tag_names',
@@ -622,6 +623,7 @@
                 'osystem',
                 'distro_series',
                 'netboot',
+                'boot_type',
                 'power_type',
                 'power_state',
                 'resource_uri',
@@ -772,6 +774,7 @@
                 'osystem',
                 'distro_series',
                 'netboot',
+                'boot_type',
                 'power_type',
                 'power_state',
                 'resource_uri',
 
=== modified file 'src/maasserver/api/tests/test_node.py'
--- src/maasserver/api/tests/test_node.py	2015-03-06 18:23:33 +0000
+++ src/maasserver/api/tests/test_node.py	2015-05-26 16:37:00 +0000
@@ -26,6 +26,7 @@
 from maasserver.api import nodes as api_nodes
 from maasserver.enum import (
     IPADDRESS_TYPE,
+    NODE_BOOT,
     NODE_STATUS,
     NODE_STATUS_CHOICES,
     POWER_STATE,
@@ -184,6 +185,14 @@
                 parsed_result['zone']['name'],
                 parsed_result['zone']['description']])
 
+    def test_GET_returns_boot_type(self):
+        node = factory.make_Node()
+        response = self.client.get(self.get_node_uri(node))
+        self.assertEqual(httplib.OK, response.status_code)
+        parsed_result = json.loads(response.content)
+        self.assertEqual(
+            node.boot_type, parsed_result['boot_type'])
+
     def test_GET_refuses_to_access_nonexistent_node(self):
         # When fetching a Node, the api returns a 'Not Found' (404) error
         # if no node is found.
@@ -930,6 +939,20 @@
         node = reload_object(node)
         self.assertEqual(original_setting, node.disable_ipv4)
 
+    def test_PUT_updates_boot_type(self):
+        node = factory.make_Node(
+            owner=self.logged_in_user,
+            architecture=make_usable_architecture(self),
+            boot_type=NODE_BOOT.FASTPATH,
+            )
+        response = self.client_put(
+            self.get_node_uri(node), {'boot_type': NODE_BOOT.DEBIAN})
+        parsed_result = json.loads(response.content)
+        self.assertEqual(httplib.OK, response.status_code, response.content)
+        node = reload_object(node)
+        self.assertEqual(node.boot_type, parsed_result['boot_type'])
+        self.assertEqual(node.boot_type, NODE_BOOT.DEBIAN)
+
     def test_DELETE_deletes_node(self):
         # The api allows to delete a Node.
         self.become_admin()
 
=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2014-12-15 09:59:57 +0000
+++ src/maasserver/forms.py	2015-05-26 16:37:00 +0000
@@ -86,6 +86,8 @@
 from maasserver.enum import (
     BOOT_RESOURCE_FILE_TYPE,
     BOOT_RESOURCE_TYPE,
+    NODE_BOOT,
+    NODE_BOOT_CHOICES,
     NODE_STATUS,
     NODEGROUPINTERFACE_MANAGEMENT,
     NODEGROUPINTERFACE_MANAGEMENT_CHOICES,
@@ -481,6 +483,13 @@
             self.cleaned_data['disable_ipv4'] = False
         return self.cleaned_data['disable_ipv4']
 
+    def clean_boot_type(self):
+        boot_type = self.cleaned_data.get('boot_type')
+        if not boot_type:
+            return NODE_BOOT.FASTPATH
+        else:
+            return boot_type
+
     def clean(self):
         cleaned_data = super(NodeForm, self).clean()
         if self.new_node and self.data.get('disable_ipv4') is None:
@@ -578,6 +587,9 @@
             "does not manage DNS, then the host name as entered will be the "
             "FQDN."))
 
+    boot_type = forms.ChoiceField(
+        choices=NODE_BOOT_CHOICES, initial=NODE_BOOT.FASTPATH, required=False)
+
     class Meta:
         model = Node
 
@@ -590,6 +602,7 @@
             'distro_series',
             'license_key',
             'disable_ipv4',
+            'boot_type',
             )
 
 
 
=== modified file 'src/maasserver/testing/factory.py'
--- src/maasserver/testing/factory.py	2014-12-04 12:33:26 +0000
+++ src/maasserver/testing/factory.py	2015-05-26 16:37:00 +0000
@@ -30,6 +30,7 @@
     BOOT_RESOURCE_FILE_TYPE,
     BOOT_RESOURCE_TYPE,
     IPADDRESS_TYPE,
+    NODE_BOOT,
     NODE_STATUS,
     NODEGROUP_STATUS,
     NODEGROUPINTERFACE_MANAGEMENT,
@@ -213,8 +214,9 @@
     def make_Node(self, mac=False, hostname=None, status=None,
                   architecture="i386/generic", updated=None,
                   created=None, nodegroup=None, routers=None, zone=None,
-                  power_type=None, networks=None, sortable_name=False,
-                  power_state=None, disable_ipv4=None, **kwargs):
+                  power_type=None, networks=None, boot_type=None,
+                  sortable_name=False, power_state=None, disable_ipv4=None,
+                  **kwargs):
         """Make a :class:`Node`.
 
         :param sortable_name: If `True`, use a that will sort consistently
@@ -242,11 +244,13 @@
             power_state = self.pick_enum(POWER_STATE)
         if disable_ipv4 is None:
             disable_ipv4 = self.pick_bool()
+        if boot_type is None:
+            boot_type = self.pick_enum(NODE_BOOT)
         node = Node(
             hostname=hostname, status=status, architecture=architecture,
             nodegroup=nodegroup, routers=routers, zone=zone,
             power_type=power_type, disable_ipv4=disable_ipv4,
-            power_state=power_state,
+            power_state=power_state, boot_type=boot_type,
             **kwargs)
         self._save_node_unchecked(node)
         # We do not generate random networks by default because the limited
 
=== modified file 'src/maasserver/tests/test_forms_node.py'
--- src/maasserver/tests/test_forms_node.py	2014-10-19 20:08:50 +0000
+++ src/maasserver/tests/test_forms_node.py	2015-05-26 16:37:00 +0000
@@ -69,6 +69,7 @@
                 'distro_series',
                 'license_key',
                 'disable_ipv4',
+                'boot_type',
                 'nodegroup'
             ], list(form.fields))
 
@@ -492,6 +493,7 @@
                 'distro_series',
                 'license_key',
                 'disable_ipv4',
+                'boot_type',
                 'power_type',
                 'power_parameters',
                 'cpu_count',