MAAS

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

  1. fix-1472707
  2. Merge into trunk
Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 4144
Proposed branch: lp:~blake-rouse/maas/fix-1472707
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 20 lines (+2/-1)
1 file modified
src/provisioningserver/rpc/cluster.py (+2/-1)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-1472707
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+266618@code.launchpad.net

Commit message

Use CompressedAmpList for the ListBootImages RPC call.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Self-approving because this has already been testing in the field.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/provisioningserver/rpc/cluster.py'
--- src/provisioningserver/rpc/cluster.py 2015-06-25 11:04:46 +0000
+++ src/provisioningserver/rpc/cluster.py 2015-07-31 20:08:24 +0000
@@ -40,6 +40,7 @@
40from provisioningserver.rpc import exceptions40from provisioningserver.rpc import exceptions
41from provisioningserver.rpc.arguments import (41from provisioningserver.rpc.arguments import (
42 Bytes,42 Bytes,
43 CompressedAmpList,
43 ParsedURL,44 ParsedURL,
44 StructureAsJSON,45 StructureAsJSON,
45)46)
@@ -58,7 +59,7 @@
5859
59 arguments = []60 arguments = []
60 response = [61 response = [
61 (b"images", amp.AmpList(62 (b"images", CompressedAmpList(
62 [(b"osystem", amp.Unicode()),63 [(b"osystem", amp.Unicode()),
63 (b"architecture", amp.Unicode()),64 (b"architecture", amp.Unicode()),
64 (b"subarchitecture", amp.Unicode()),65 (b"subarchitecture", amp.Unicode()),