Merge lp:~blake-rouse/maas/is-importing into lp:maas/trunk

[Blake Rouse]

Add is_importing call to boot resources API.

[Mike Pontillo (mpontillo)]

LGTM!

review: Approve

[Brendan Donegan (brendan-donegan)]

I know this is merged, and thanks - but wouldn't it be nicer if this returned JSON? I'll make do in the meantime but writing something like:

if output == 'false':

is just... wrong

[Gavin Panella (allenap)]

That is JSON:

  >>> import json
  >>> json.loads("false")
  False

[Brendan Donegan (brendan-donegan)]

Oops, thanks

On Wed, 7 Dec 2016 at 10:22 Gavin Panella <email address hidden>
wrote:

> That is JSON:
>
> >>> import json
> >>> json.loads("false")
> False
>
> --
> https://code.launchpad.net/~blake-rouse/maas/is-importing/+merge/312591
> You are subscribed to branch lp:maas.
>

=== modified file 'src/maasserver/api/boot_resources.py'
--- src/maasserver/api/boot_resources.py	2016-09-29 16:53:21 +0000
+++ src/maasserver/api/boot_resources.py	2016-12-06 17:28:08 +0000
@@ -25,6 +25,7 @@
 from maasserver.api.utils import get_optional_param
 from maasserver.bootresources import (
     import_resources,
+    is_import_resources_running,
     stop_import_resources,
 )
 from maasserver.enum import (
@@ -236,6 +237,11 @@
             "Import of boot resources is being stopped",
             content_type=("text/plain; charset=%s" % settings.DEFAULT_CHARSET))
 
+    @operation(idempotent=True)
+    def is_importing(self, request):
+        """Return import status."""
+        return is_import_resources_running()
+
     @classmethod
     def resource_uri(cls, *args, **kwargs):
         return ('boot_resources_handler', [])

=== modified file 'src/maasserver/api/tests/test_boot_resources.py'
--- src/maasserver/api/tests/test_boot_resources.py	2016-09-29 16:53:21 +0000
+++ src/maasserver/api/tests/test_boot_resources.py	2016-12-06 17:28:08 +0000
@@ -404,6 +404,16 @@
         self.assertEqual(http.client.OK, response.status_code)
         self.assertThat(mock_stop, MockCalledOnceWith())
 
+    def test_is_importing_returns_import_status(self):
+        mock_running = self.patch(
+            boot_resources, "is_import_resources_running")
+        mock_running.return_value = factory.pick_bool()
+        response = self.client.get(
+            reverse('boot_resources_handler'), {'op': 'is_importing'})
+        self.assertEqual(http.client.OK, response.status_code)
+        self.assertEqual(
+            mock_running.return_value, json_load_bytes(response.content))
+
 
 class TestBootResourceAPI(APITestCase.ForUser):