← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/launchpad/export-das-processor into lp:launchpad

 

Colin Watson has proposed merging lp:~cjwatson/launchpad/export-das-processor into lp:launchpad.

Commit message:
Export link from DistroArchSeries to Processor.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1260695 in Launchpad itself: "export link from DistroArchSeries to Processor"
  https://bugs.launchpad.net/launchpad/+bug/1260695

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/export-das-processor/+merge/198935

Export DAS.processor.  I ran into this when trying to figure out a nice way for the CI folks to tell that ppa:ubuntu-unity/daily-build builds don't need to block on ppc64el; for that you need to check Processor.restricted and Archive.enabled_restricted_processors.
-- 
https://code.launchpad.net/~cjwatson/launchpad/export-das-processor/+merge/198935
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/export-das-processor into lp:launchpad.
=== modified file 'lib/lp/soyuz/interfaces/distroarchseries.py'
--- lib/lp/soyuz/interfaces/distroarchseries.py	2013-10-26 16:17:29 +0000
+++ lib/lp/soyuz/interfaces/distroarchseries.py	2013-12-13 12:57:50 +0000
@@ -21,7 +21,10 @@
     operation_for_version,
     operation_parameters,
     )
-from lazr.restful.fields import Reference
+from lazr.restful.fields import (
+    Reference,
+    ReferenceChoice,
+    )
 from zope.interface import (
     Attribute,
     Interface,
@@ -29,7 +32,6 @@
 from zope.schema import (
     Bool,
     Bytes,
-    Choice,
     Int,
     Text,
     TextLine,
@@ -41,6 +43,7 @@
 from lp.registry.interfaces.person import IPerson
 from lp.registry.interfaces.role import IHasOwner
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
+from lp.soyuz.interfaces.processor import IProcessor
 
 
 @error_status(httplib.BAD_REQUEST)
@@ -57,8 +60,10 @@
             IDistroSeries,
             title=_("The context distroseries"),
             required=False, readonly=False))
-    processor = Choice(
-        title=_("Processor"), required=True, vocabulary='Processor')
+    processor = exported(
+        ReferenceChoice(
+            title=_("Processor"), required=True, vocabulary='Processor',
+            schema=IProcessor))
     architecturetag = exported(
         TextLine(
             title=_("Architecture Tag"),

=== modified file 'lib/lp/soyuz/stories/webservice/xx-distroarchseries.txt'
--- lib/lp/soyuz/stories/webservice/xx-distroarchseries.txt	2013-09-13 06:20:49 +0000
+++ lib/lp/soyuz/stories/webservice/xx-distroarchseries.txt	2013-12-13 12:57:50 +0000
@@ -1,4 +1,5 @@
-= Distribution Arch Series =
+Distribution Arch Series
+========================
 
 We can get a distroarchseries object via a distroseries object custom
 operation:
@@ -42,6 +43,7 @@
     official: True
     owner_link: u'http://.../~mark'
     package_count: 1
+    processor_link: u'http://.../+processors/386'
     resource_type_link: u'http://.../#distro_arch_series'
     self_link: u'http://.../ubuntu/hoary/i386'
     supports_virtualized: True
@@ -64,6 +66,7 @@
     official: True
     owner_link: u'http://.../~mark'
     package_count: 1
+    processor_link: u'http://.../+processors/386'
     resource_type_link: u'http://.../#distro_arch_series'
     self_link: u'http://.../ubuntu/hoary/i386'
     supports_virtualized: True


Follow ups