Merge lp:~al-maisan/launchpad/newuris-399186 into lp:launchpad/db-devel

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Hello there!

a branch that introduces the association between package sets and distro
series has already landed on db-devel.

Package set names are now *not* globally unique any more but only unique
within the context of a distro series.

The branch at hand revises the package set traversal rules accordingly.

Pre-implementation call with Michael Nelson.

Tests to run:

    bin/test -vvt packageset

No pertinent "make lint" errors or warnings.

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/lp/soyuz/browser/configure.zcml'
--- lib/lp/soyuz/browser/configure.zcml	2009-10-22 10:33:00 +0000
+++ lib/lp/soyuz/browser/configure.zcml	2009-10-30 10:10:25 +0000
@@ -783,7 +783,7 @@
         />
     <browser:url
         for="lp.soyuz.interfaces.packageset.IPackageset"
-        path_expression="name"
+        path_expression="string:${distroseries/name}/${name}"
         parent_utility="lp.soyuz.interfaces.packageset.IPackagesetSet"
         />
     <browser:url
 
=== modified file 'lib/lp/soyuz/browser/packageset.py'
--- lib/lp/soyuz/browser/packageset.py	2009-06-30 16:56:07 +0000
+++ lib/lp/soyuz/browser/packageset.py	2009-10-30 10:10:25 +0000
@@ -17,3 +17,22 @@
 class PackagesetSetNavigation(GetitemNavigation):
     """Navigation methods for PackagesetSet."""
     usedfor = IPackagesetSet
+
+    def traverse(self, distroseries):
+        """Traverse package sets in distro series context.
+
+        The URI fragment of interest is:
+
+            /package-sets/lucid/mozilla
+
+        where 'lucid' is the distro series and 'mozilla' is the package set
+        *name* respectively.
+        """
+        if self.request.stepstogo:
+            # The package set name follows after the distro series.
+            ps_name = self.request.stepstogo.consume()
+            return self.context.getByName(ps_name, distroseries=distroseries)
+
+        # Otherwise return None (to trigger a NotFound error).
+        return None
+        
 
=== modified file 'lib/lp/soyuz/interfaces/archivepermission.py'
--- lib/lp/soyuz/interfaces/archivepermission.py	2009-08-03 17:10:12 +0000
+++ lib/lp/soyuz/interfaces/archivepermission.py	2009-10-30 10:10:25 +0000
@@ -284,6 +284,9 @@
     def uploadersForPackageset(archive, packageset, direct_permissions=True):
         """The `ArchivePermission` records for uploaders to the package set.
 
+        Please note: if a package set *name* is passed the respective
+                     package set in the current distro series will be used.
+
         :param archive: The archive the permission applies to.
         :param packageset: An `IPackageset` or a string package set name.
         :param direct_permissions: If True only consider permissions granted
@@ -332,6 +335,9 @@
     def newPackagesetUploader(archive, person, packageset, explicit=False):
         """Create and return a new `ArchivePermission` for an uploader.
 
+        Please note: if a package set *name* is passed the respective
+                     package set in the current distro series will be used.
+
         :param archive: The archive the permission applies to.
         :param person: An `IPerson` for whom you want to add permission.
         :param packageset: An `IPackageset` or a string package set name.
@@ -379,6 +385,9 @@
     def deletePackagesetUploader(archive, person, packageset, explicit=False):
         """Revoke upload permissions for a person.
 
+        Please note: if a package set *name* is passed the respective
+                     package set in the current distro series will be used.
+
         :param archive: The archive the permission applies to.
         :param person: An `IPerson` for whom you want to revoke permission.
         :param packageset: An `IPackageset` or a string package set name.
 
=== modified file 'lib/lp/soyuz/interfaces/packageset.py'
--- lib/lp/soyuz/interfaces/packageset.py	2009-10-27 23:40:24 +0000
+++ lib/lp/soyuz/interfaces/packageset.py	2009-10-30 10:10:25 +0000
@@ -37,7 +37,7 @@
     """Raised when we try to look up an PackageSet that doesn't exist."""
     # Bad request.
     webservice_error(400)
-    _message_prefix = "No such packageset"
+    _message_prefix = "No such package set (in the specified distro series)"
 
 
 class DuplicatePackagesetName(Exception):
@@ -68,17 +68,17 @@
         title=_("Description"), required=True, readonly=True,
         description=_("The description for the package set at hand.")))
 
-    distroseries = Reference(
+    distroseries = exported(Reference(
         IDistroSeries, title=_("Distribution series"), required=True,
         readonly=True,
         description=_(
-            "The distroseries to which this package set is related."))
+            "The distroseries to which this package set is related.")))
 
     packagesetgroup = Reference(
-        IPackagesetGroup, title=_('Packageset group'), required=True,
+        IPackagesetGroup, title=_('Package set group'), required=True,
         readonly=True,
         description=_(
-            'Used internally to link packagesets across distroseries'))
+            'Used internally to link package sets across distro series.'))
 
     def sourcesIncluded(direct_inclusion=False):
         """Get all source names associated with this package set.
 
=== modified file 'lib/lp/soyuz/model/archivepermission.py'
--- lib/lp/soyuz/model/archivepermission.py	2009-07-28 21:52:56 +0000
+++ lib/lp/soyuz/model/archivepermission.py	2009-10-30 10:10:25 +0000
@@ -22,6 +22,7 @@
 from canonical.database.enumcol import EnumCol
 from canonical.database.sqlbase import sqlvalues, SQLBase
 
+from lp.registry.interfaces.distribution import IDistributionSet
 from lp.soyuz.interfaces.archive import ComponentNotFound
 from lp.soyuz.interfaces.archivepermission import (
     ArchivePermissionType, IArchivePermission, IArchivePermissionSet,
@@ -312,9 +313,13 @@
     def _nameToPackageset(self, packageset):
         """Helper to convert a possible string name to IPackageset."""
         if isinstance(packageset, basestring):
+            # A package set name was passed, assume the current distro series.
+            ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
             name = packageset
             store = IStore(Packageset)
-            packageset = store.find(Packageset, name=name).one()
+            packageset = store.find(
+                Packageset, name=name,
+                distroseries=ubuntu.currentseries).one()
             if packageset is not None:
                 return packageset
             else:
 
=== modified file 'lib/lp/soyuz/model/packageset.py'
--- lib/lp/soyuz/model/packageset.py	2009-10-27 15:42:04 +0000
+++ lib/lp/soyuz/model/packageset.py	2009-10-30 10:10:25 +0000
@@ -14,6 +14,7 @@
 from zope.interface import implements
 
 from canonical.launchpad.interfaces.lpstorm import IMasterStore, IStore
+from canonical.launchpad.webapp.interfaces import NotFoundError
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.sourcepackagename import (
     ISourcePackageName, ISourcePackageNameSet)
@@ -350,11 +351,17 @@
         if not isinstance(name, unicode):
             name = unicode(name, 'utf-8')
 
+        ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
         extra_args = []
         if distroseries is not None:
+            # If the user just passed a distro series name, look it up.
+            if isinstance(distroseries, basestring):
+                try:
+                    distroseries = ubuntu[distroseries]
+                except NotFoundError:
+                    raise NoSuchPackageSet(distroseries)
             extra_args.append(Packageset.distroseries == distroseries)
         else:
-            ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
             extra_args.append(Packageset.distroseries == ubuntu.currentseries)
 
         package_set = store.find(
@@ -362,6 +369,7 @@
 
         if package_set is None:
             raise NoSuchPackageSet(name)
+
         return package_set
 
     def getByOwner(self, owner):
 
=== modified file 'lib/lp/soyuz/stories/webservice/xx-packageset.txt'
--- lib/lp/soyuz/stories/webservice/xx-packageset.txt	2009-08-20 04:46:48 +0000
+++ lib/lp/soyuz/stories/webservice/xx-packageset.txt	2009-10-30 10:10:25 +0000
@@ -52,16 +52,16 @@
 Can we access it via the webservice API as well?
 
     >>> logout()
-    >>> umbrella = webservice.get("/package-sets/umbrella").jsonBody()
+    >>> umbrella = webservice.get("/package-sets/hoary/umbrella").jsonBody()
     >>> print umbrella['self_link']
-    http://api.launchpad.dev/beta/package-sets/umbrella
+    http://api.launchpad.dev/beta/package-sets/hoary/umbrella
 
 `PackageSet`s can be looked up by name.
 
     >>> response = webservice.named_get(
     ...     '/package-sets', 'getByName', {}, name=u'umbrella')
     >>> print response.jsonBody()['self_link']
-    http://api.launchpad.dev/beta/package-sets/umbrella
+    http://api.launchpad.dev/beta/package-sets/hoary/umbrella
 
 When a `PackageSet` cannot be found, an error is returned.
 
@@ -70,9 +70,17 @@
     >>> print response
     HTTP/1.1 400 Bad Request
     ...
-    NoSuchPackageSet: No such packageset: 'not-found'.
+    No such package set (in the specified distro series): 'not-found'.
+    ...
     <BLANKLINE>
 
+Here's an example with a funny URL concoted by a "smart" user.
+
+    >>> response = webservice.get("/package-sets/lucid-plus-1/umbrella/+pwn")
+    >>> print response
+    HTTP/1.1 404 Not Found
+    ...
+
 Populate the 'umbrella' package set with source packages.
 
     >>> from canonical.launchpad.webapp.interfaces import (
@@ -81,7 +89,7 @@
     >>> store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
     >>> all_spns = store.find(SourcePackageName)
     >>> response = webservice.named_post(
-    ...     '/package-sets/umbrella', 'addSources', {},
+    ...     '/package-sets/hoary/umbrella', 'addSources', {},
     ...     names=[spn.name for spn in all_spns])
     >>> print response
     HTTP/1.1 200 Ok
@@ -91,7 +99,7 @@
 exist will not fail. Non-existing source package names are *ignored*.
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/umbrella', 'addSources', {},
+    ...     '/package-sets/hoary/umbrella', 'addSources', {},
     ...     names=[u'does-not-exist'])
     >>> print response
     HTTP/1.1 200 Ok
@@ -99,7 +107,7 @@
     null
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/umbrella', 'removeSources', {},
+    ...     '/package-sets/hoary/umbrella', 'removeSources', {},
     ...     names=[u'does-not-exist'])
     >>> print response
     HTTP/1.1 200 Ok
@@ -109,7 +117,7 @@
 Let's see what we got.
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/umbrella', 'getSourcesIncluded', {})
+    ...     '/package-sets/hoary/umbrella', 'getSourcesIncluded', {})
     >>> print response
     HTTP/1.1 200 Ok
     ...
@@ -136,7 +144,7 @@
 from the 'umbrella' package set.
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/umbrella', 'removeSources', {},
+    ...     '/package-sets/hoary/umbrella', 'removeSources', {},
     ...     names=["foobar", "iceweasel"])
     >>> print response
     HTTP/1.1 200 Ok
@@ -146,7 +154,7 @@
 from the list below.
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/umbrella', 'getSourcesIncluded', {})
+    ...     '/package-sets/hoary/umbrella', 'getSourcesIncluded', {})
     >>> print response
     HTTP/1.1 200 Ok
     ...
@@ -176,13 +184,13 @@
 
     >>> response = webservice.get("/package-sets/")
     >>> print_payload(response)
-    http://api.launchpad.dev/beta/package-sets/umbrella
+    http://api.launchpad.dev/beta/package-sets/hoary/umbrella
 
 Package sets may include other package sets (as subsets). At this point,
 however, we only have the 'umbrella' package set. It hence has no subsets.
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/umbrella', 'setsIncluded', {})
+    ...     '/package-sets/hoary/umbrella', 'setsIncluded', {})
     >>> print response
     HTTP/1.1 200 Ok
     ...
@@ -245,27 +253,27 @@
           * languagepack
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/umbrella', 'addSubsets', {},
+    ...     '/package-sets/hoary/umbrella', 'addSubsets', {},
     ...     names=[u'gnome', u'mozilla'])
     >>> print response
     HTTP/1.1 200 Ok
     ...
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/gnome', 'addSubsets', {}, names=[u'languagepack'])
+    ...     '/package-sets/hoary/gnome', 'addSubsets', {}, names=[u'languagepack'])
     >>> print response
     HTTP/1.1 200 Ok
     ...
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/thunderbird', 'addSubsets', {},
+    ...     '/package-sets/hoary/thunderbird', 'addSubsets', {},
     ...     names=[u'languagepack'])
     >>> print response
     HTTP/1.1 200 Ok
     ...
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/mozilla', 'addSubsets', {},
+    ...     '/package-sets/hoary/mozilla', 'addSubsets', {},
     ...     names=[u'firefox', u'thunderbird'])
     >>> print response
     HTTP/1.1 200 Ok
@@ -275,7 +283,7 @@
 non-existing package sets will not fail.
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/thunderbird', 'addSubsets', {},
+    ...     '/package-sets/hoary/thunderbird', 'addSubsets', {},
     ...     names=[u'does-not-exist'])
     >>> print response
     HTTP/1.1 200 Ok
@@ -283,7 +291,7 @@
     null
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/thunderbird', 'removeSubsets', {},
+    ...     '/package-sets/hoary/thunderbird', 'removeSubsets', {},
     ...     names=[u'does-not-exist'])
     >>> print response
     HTTP/1.1 200 Ok
@@ -293,49 +301,49 @@
 The 'umbrella' package set should have plenty of subsets now.
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/umbrella', 'setsIncluded', {})
+    ...     '/package-sets/hoary/umbrella', 'setsIncluded', {})
     >>> print_payload(response)
-    http://api.launchpad.dev/beta/package-sets/firefox
-    http://api.launchpad.dev/beta/package-sets/gnome
-    http://api.launchpad.dev/beta/package-sets/languagepack
-    http://api.launchpad.dev/beta/package-sets/mozilla
-    http://api.launchpad.dev/beta/package-sets/thunderbird
+    http://api.launchpad.dev/beta/package-sets/hoary/firefox
+    http://api.launchpad.dev/beta/package-sets/hoary/gnome
+    http://api.launchpad.dev/beta/package-sets/hoary/languagepack
+    http://api.launchpad.dev/beta/package-sets/hoary/mozilla
+    http://api.launchpad.dev/beta/package-sets/hoary/thunderbird
 
 However only two of the above are direct subsets.
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/umbrella', 'setsIncluded', {},
+    ...     '/package-sets/hoary/umbrella', 'setsIncluded', {},
     ...     direct_inclusion=True)
     >>> print_payload(response)
-    http://api.launchpad.dev/beta/package-sets/gnome
-    http://api.launchpad.dev/beta/package-sets/mozilla
+    http://api.launchpad.dev/beta/package-sets/hoary/gnome
+    http://api.launchpad.dev/beta/package-sets/hoary/mozilla
 
 Let's ask the question the other way around what package sets are including
 a particular subset?
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/languagepack', 'setsIncludedBy', {})
+    ...     '/package-sets/hoary/languagepack', 'setsIncludedBy', {})
     >>> print_payload(response)
-    http://api.launchpad.dev/beta/package-sets/gnome
-    http://api.launchpad.dev/beta/package-sets/mozilla
-    http://api.launchpad.dev/beta/package-sets/thunderbird
-    http://api.launchpad.dev/beta/package-sets/umbrella
+    http://api.launchpad.dev/beta/package-sets/hoary/gnome
+    http://api.launchpad.dev/beta/package-sets/hoary/mozilla
+    http://api.launchpad.dev/beta/package-sets/hoary/thunderbird
+    http://api.launchpad.dev/beta/package-sets/hoary/umbrella
 
 The list of package sets that *directly* include 'languagepack' will be
 shorter because the transitive closure is ignored.
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/languagepack', 'setsIncludedBy', {},
+    ...     '/package-sets/hoary/languagepack', 'setsIncludedBy', {},
     ...     direct_inclusion=True)
     >>> print_payload(response)
-    http://api.launchpad.dev/beta/package-sets/gnome
-    http://api.launchpad.dev/beta/package-sets/thunderbird
+    http://api.launchpad.dev/beta/package-sets/hoary/gnome
+    http://api.launchpad.dev/beta/package-sets/hoary/thunderbird
 
 We can remove subsets as well. In the example below 'thunderbird' will
 stop including 'languagepack'.
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/thunderbird', 'removeSubsets', {},
+    ...     '/package-sets/hoary/thunderbird', 'removeSubsets', {},
     ...     names=[u'languagepack'])
     >>> print response
     HTTP/1.1 200 Ok
@@ -344,37 +352,37 @@
 And, here we go, now 'languagepack' has only one direct predecessor: 'gnome'.
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/languagepack', 'setsIncludedBy', {},
+    ...     '/package-sets/hoary/languagepack', 'setsIncludedBy', {},
     ...     direct_inclusion=True)
     >>> print_payload(response)
-    http://api.launchpad.dev/beta/package-sets/gnome
+    http://api.launchpad.dev/beta/package-sets/hoary/gnome
 
 Let's add a few source packages to the 'firefox' and the 'thunderbird'
 package sets.
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/firefox', 'addSources', {},
+    ...     '/package-sets/hoary/firefox', 'addSources', {},
     ...     names=['at', 'mozilla-firefox', 'language-pack-de'])
     >>> print response
     HTTP/1.1 200 Ok
     ...
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/firefox', 'getSourcesIncluded', {})
+    ...     '/package-sets/hoary/firefox', 'getSourcesIncluded', {})
     >>> print response
     HTTP/1.1 200 Ok
     ...
     ["at", "language-pack-de", "mozilla-firefox"]
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/thunderbird', 'addSources', {},
+    ...     '/package-sets/hoary/thunderbird', 'addSources', {},
     ...     names=['at', 'cnews', 'thunderbird', 'language-pack-de'])
     >>> print response
     HTTP/1.1 200 Ok
     ...
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/thunderbird', 'getSourcesIncluded', {})
+    ...     '/package-sets/hoary/thunderbird', 'getSourcesIncluded', {})
     >>> print response
     HTTP/1.1 200 Ok
     ...
@@ -386,9 +394,9 @@
     ...     '/package-sets/', 'setsIncludingSource', {},
     ...     sourcepackagename=u'mozilla-firefox')
     >>> print_payload(response)
-    http://api.launchpad.dev/beta/package-sets/firefox
-    http://api.launchpad.dev/beta/package-sets/mozilla
-    http://api.launchpad.dev/beta/package-sets/umbrella
+    http://api.launchpad.dev/beta/package-sets/hoary/firefox
+    http://api.launchpad.dev/beta/package-sets/hoary/mozilla
+    http://api.launchpad.dev/beta/package-sets/hoary/umbrella
 
 Which package sets include the 'mozilla-firefox' source package *directly*?
 
@@ -397,8 +405,8 @@
     ...     sourcepackagename=u'mozilla-firefox',
     ...     direct_inclusion=True)
     >>> print_payload(response)
-    http://api.launchpad.dev/beta/package-sets/firefox
-    http://api.launchpad.dev/beta/package-sets/umbrella
+    http://api.launchpad.dev/beta/package-sets/hoary/firefox
+    http://api.launchpad.dev/beta/package-sets/hoary/umbrella
 
 If a non-existing source package name is passed it returns an error.
 
@@ -414,9 +422,9 @@
 What source packages are shared by the 'firefox' and the 'thunderbird'
 package sets?
 
-    >>> thunderbird = webservice.get("/package-sets/thunderbird").jsonBody()
+    >>> thunderbird = webservice.get("/package-sets/hoary/thunderbird").jsonBody()
     >>> response = webservice.named_get(
-    ...     '/package-sets/firefox', 'getSourcesSharedBy', {},
+    ...     '/package-sets/hoary/firefox', 'getSourcesSharedBy', {},
     ...     other_package_set=thunderbird['self_link'])
     >>> print response
     HTTP/1.1 200 Ok
@@ -426,16 +434,16 @@
 How about the complement set i.e. the packages not shared?
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/firefox', 'getSourcesNotSharedBy', {},
+    ...     '/package-sets/hoary/firefox', 'getSourcesNotSharedBy', {},
     ...     other_package_set=thunderbird['self_link'])
     >>> print response
     HTTP/1.1 200 Ok
     ...
     ["mozilla-firefox"]
 
-    >>> firefox = webservice.get("/package-sets/firefox").jsonBody()
+    >>> firefox = webservice.get("/package-sets/hoary/firefox").jsonBody()
     >>> response = webservice.named_get(
-    ...     '/package-sets/thunderbird', 'getSourcesNotSharedBy', {},
+    ...     '/package-sets/hoary/thunderbird', 'getSourcesNotSharedBy', {},
     ...     other_package_set=firefox['self_link'])
     >>> print response
     HTTP/1.1 200 Ok
@@ -443,6 +451,39 @@
     ["cnews", "thunderbird"]
 
 
+=== Package sets and distro series ===
+
+Every package set is associated with a distro series.
+
+    >>> from lazr.restful.testing.webservice import pprint_entry
+    >>> mozilla = webservice.named_get(
+    ...     '/package-sets', 'getByName', {}, name=u'mozilla').jsonBody()
+    >>> print mozilla['distroseries_link']
+    http://api.launchpad.dev/beta/ubuntu/hoary
+
+
+=== Related package sets ===
+
+When adding a package set we can specify that is to be related to another set
+that exists already.
+
+    >>> grumpy = webservice.get("/ubuntu/grumpy").jsonBody()
+    >>> print grumpy['self_link']
+    http://api.launchpad.dev/beta/ubuntu/grumpy
+
+We are adding a new 'mozilla' package set to the 'grumpy' distro series and
+it is related to 'mozilla' in 'hoary'.
+
+    >>> response = webservice.named_post(
+    ...     '/package-sets', 'new', {},
+    ...     name=u'mozilla',
+    ...     description=u'Contains all mozilla packages',
+    ...     owner=name12['self_link'], distroseries=grumpy['self_link'],
+    ...     related_set=mozilla['self_link'])
+    >>> print response
+    HTTP/1.1 201 Created
+    ...
+
 == Archive permissions and package sets ==
 
 Operating on package set based archive permissions is possible via