Merge ~cgrabowski/maas:maas_cli_read_boot_resource_as_bytes into maas:master

[Christian Grabowski]

remove rb from make_Content to have the same behavior as what's actually passed to action

read boot resources as bytes

[Alberto Donato (ack)]

+1, thanks for the fix

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b maas_cli_read_boot_resource_as_bytes lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 613ae7c058aa09bbbc25fd10eac42aeddf64589a

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b maas_cli_read_boot_resource_as_bytes lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/10870/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b maas_cli_read_boot_resource_as_bytes lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/10875/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b maas_cli_read_boot_resource_as_bytes lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/10876/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b maas_cli_read_boot_resource_as_bytes lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: b33003bce4ca3ce18f5bea9acc7ba376a7d1fc1f

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b maas_cli_read_boot_resource_as_bytes lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 6b57a131afcd36adc0f67666b6649dce63e3e510

review: Approve

diff --git a/src/maascli/actions/boot_resources_create.py b/src/maascli/actions/boot_resources_create.py
index faae098..6640c3b 100644
--- a/src/maascli/actions/boot_resources_create.py
+++ b/src/maascli/actions/boot_resources_create.py
@@ -118,7 +118,7 @@ class BootResourcesCreateAction(Action):
         """Return the size and sha256 of the content."""
         size = 0
         sha256 = hashlib.sha256()
-        with content() as fd:
+        with content("rb") as fd:
             while True:
                 buf = fd.read(CHUNK_SIZE)
                 length = len(buf)
@@ -164,7 +164,7 @@ class BootResourcesCreateAction(Action):
 
     def upload_content(self, upload_uri, content, insecure=False):
         """Upload the content in chunks."""
-        with content() as fd:
+        with content("rb") as fd:
             while True:
                 buf = fd.read(CHUNK_SIZE)
                 length = len(buf)
diff --git a/src/maascli/actions/tests/test_boot_resources_create.py b/src/maascli/actions/tests/test_boot_resources_create.py
index 54c40c6..8a5a76c 100644
--- a/src/maascli/actions/tests/test_boot_resources_create.py
+++ b/src/maascli/actions/tests/test_boot_resources_create.py
@@ -55,7 +55,9 @@ class TestBootResourcesCreateAction(MAASTestCase):
             stream.write(data)
         sha256 = hashlib.sha256()
         sha256.update(data)
-        return size, sha256.hexdigest(), partial(open, content_path, "rb")
+        # the parser will create a partial function without "r" or "rb",
+        # that is then passed upon calling content
+        return size, sha256.hexdigest(), partial(open, content_path)
 
     def test_initial_request_returns_content(self):
         content = factory.make_name("content")
diff --git a/src/maascli/api.py b/src/maascli/api.py
index 0f02b37..d2494c6 100644
--- a/src/maascli/api.py
+++ b/src/maascli/api.py
@@ -189,7 +189,8 @@ class Action(Command):
         However, when `string` is of the form ``name@=value``, this
         returns a ``name, opener`` tuple, where ``opener`` is a function
         that will return an open file handle when called. The file will
-        be opened in binary mode for reading only.
+        be opened for reading only, actions will open it as text by default,
+        but may use binary mode if specified.
         """
         parts = re.split(r"(=|@=)", string, 1)
         if len(parts) == 3: