Merge lp:~blake-rouse/maas/fix-keydata-base64 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Removed base64 encoding of keyring_data on BootSource model, as its not needed for calling import boot images over RPC.

[Gavin Panella (allenap)]

Cool, with one comment.

review: Approve

=== modified file 'src/maasserver/bootresources.py'
--- src/maasserver/bootresources.py	2014-08-25 17:19:56 +0000
+++ src/maasserver/bootresources.py	2014-08-26 17:41:09 +0000
@@ -81,6 +81,7 @@
     return {
         'url': absolute_reverse(
             'simplestreams_stream_handler', kwargs={'filename': 'index.json'}),
+        'keyring_data': b'',
         'selections': [],
         }
 

=== modified file 'src/maasserver/models/bootsource.py'
--- src/maasserver/models/bootsource.py	2014-08-15 03:43:34 +0000
+++ src/maasserver/models/bootsource.py	2014-08-26 17:41:09 +0000
@@ -17,8 +17,6 @@
     ]
 
 
-from base64 import b64encode
-
 from django.core.exceptions import ValidationError
 from django.db.models import (
     FilePathField,
@@ -80,9 +78,7 @@
                 keyring_data = keyring_file.read()
         return {
             "url": self.url,
-            # TODO: Don't encode once this no longer needs to be
-            # transmitted to a Celery task.
-            "keyring_data": b64encode(keyring_data),
+            "keyring_data": bytes(keyring_data),
             "selections": [
                 selection.to_dict()
                 for selection in self.bootsourceselection_set.all()],

=== modified file 'src/maasserver/models/tests/test_bootsource.py'
--- src/maasserver/models/tests/test_bootsource.py	2014-08-12 15:15:06 +0000
+++ src/maasserver/models/tests/test_bootsource.py	2014-08-26 17:41:09 +0000
@@ -14,7 +14,6 @@
 __metaclass__ = type
 __all__ = []
 
-from base64 import b64encode
 import os
 
 from django.core.exceptions import ValidationError
@@ -75,7 +74,7 @@
         source = boot_source.to_dict()
         self.assertEqual(
             source['keyring_data'],
-            b64encode(keyring_data))
+            keyring_data)
 
     def test_to_dict_handles_keyring_data(self):
         keyring_data = b"Some Keyring Data"
@@ -84,4 +83,4 @@
         source = boot_source.to_dict()
         self.assertEqual(
             source['keyring_data'],
-            b64encode(keyring_data))
+            keyring_data)

=== modified file 'src/maasserver/rpc/bootsources.py'
--- src/maasserver/rpc/bootsources.py	2014-08-25 14:33:20 +0000
+++ src/maasserver/rpc/bootsources.py	2014-08-26 17:41:09 +0000
@@ -16,8 +16,6 @@
     "get_boot_sources",
 ]
 
-from base64 import b64decode
-
 from maasserver.models import BootSource
 from maasserver.utils.async import transactional
 from provisioningserver.utils.twisted import synchronous
@@ -41,11 +39,7 @@
         source.to_dict()
         for source in BootSource.objects.all()
     ]
-    # Replace the keyring_data value (base-64 encoded keyring) with
-    # the raw bytes; AMP is fine with bytes.
     for source in sources:
-        keyring_data = source.pop("keyring_data")
-        source["keyring_data"] = b64decode(keyring_data)
         if remove_os:
             for selection in source['selections']:
                 del selection['os']

=== modified file 'src/maasserver/rpc/tests/test_bootsources.py'
--- src/maasserver/rpc/tests/test_bootsources.py	2014-08-25 14:08:13 +0000
+++ src/maasserver/rpc/tests/test_bootsources.py	2014-08-26 17:41:09 +0000
@@ -28,10 +28,6 @@
         factory.make_boot_source_selection(source)
 
         expected = source.to_dict()
-        # keyring_data contains the b64decoded representation since AMP
-        # is fine with bytes.
-        expected["keyring_data"] = keyring
-
         self.assertEqual([expected], get_boot_sources(nodegroup.uuid))
 
     def test_removes_os_from_boot_source_selections(self):
@@ -41,10 +37,6 @@
         factory.make_boot_source_selection(source)
 
         expected = source.to_dict()
-        # keyring_data contains the b64decoded representation since AMP
-        # is fine with bytes.
-        expected["keyring_data"] = keyring
         del expected['selections'][0]['os']
-
         self.assertEqual(
             [expected], get_boot_sources(nodegroup.uuid, remove_os=True))

=== modified file 'src/maasserver/rpc/tests/test_regionservice.py'
--- src/maasserver/rpc/tests/test_regionservice.py	2014-08-26 14:32:36 +0000
+++ src/maasserver/rpc/tests/test_regionservice.py	2014-08-26 17:41:09 +0000
@@ -266,10 +266,6 @@
 
         uuid, boot_source = yield deferToThread(
             self.make_boot_source_selection, keyring)
-
-        # keyring_data contains the b64decoded representation since AMP
-        # is fine with bytes.
-        boot_source["keyring_data"] = keyring
         del boot_source['selections'][0]['os']
 
         response = yield call_responder(