Merge lp:~michael.nelson/rnr-server/731376-other-origins-2 into lp:rnr-server

[Michael Nelson]

[r=zematynnad][bug=731376] Enable reviews of packages in pay ppas.

Overview
========
This branch continues on from:

https://code.launchpad.net/~michael.nelson/rnr-server/731736-other-origins/+merge/53007

adding the functionality to verify packages specified on reviews for purchase software.

Details
=======

All the tests work on mocked APIs, and you can test the real deal with something like:

https://pastebin.canonical.com/44659/

I also added a preflight check to ensure the sca available apps are available via the network, and updated the preflight tests so that they don't hit the network.

[Danny Tamez (zematynnad)]

Approved - I'll put line 27 back in in another branch.

review: Approve

[Michael Nelson (michael.nelson)]

On Mon, Mar 14, 2011 at 7:06 PM, Danny Tamez <email address hidden>wrote:

> Review: Approve
> Approved - I'll put line 27 back in in another branch.
>

Thanks Danny - Ah, I'd only deleted line 27 because it wasn't being used...
if it's for another branch you've got ready I'll just leave it in.

Cheers.

[ISD Branch Mangler (isd-branches-mangler)]

The prerequisite lp:~michael.nelson/rnr-server/731736-other-origins has not yet been merged into lp:rnr-server.

=== modified file 'django_project/config_dev/config/main.cfg'
--- django_project/config_dev/config/main.cfg	2011-03-15 09:47:29 +0000
+++ django_project/config_dev/config/main.cfg	2011-03-11 21:09:10 +0000
@@ -98,14 +98,6 @@
 cache_review_stats_seconds = 14400
 token_cache_expiry_hours = 4
 reviewsapp_media_root = src/reviewsapp/media
-commercial_origins = lp-ppa-commercial-ppa-uploaders-fluendo-dvd
-                     lp-ppa-commercial-ppa-uploaders-fluendo-plugins
-                     lp-ppa-commercial-ppa-uploaders-fluendo-wmv-plugins
-                     lp-ppa-commercial-ppa-uploaders-brukkon
-                     lp-ppa-commercial-ppa-uploaders-vendetta-online
-                     lp-ppa-commercial-ppa-uploaders-world-of-goo
-                     lp-ppa-commercial-ppa-uploaders-illumination
-
 
 [sso_api]
 sso_api_service_root = https://login.staging.ubuntu.com/api/1.0

=== modified file 'django_project/config_dev/schema.py'
--- django_project/config_dev/schema.py	2011-03-15 09:47:29 +0000
+++ django_project/config_dev/schema.py	2011-03-15 09:47:29 +0000
@@ -4,7 +4,6 @@
     IntConfigOption, LinesConfigOption, StringConfigOption)
 from django_configglue.schema import schemas
 
-from reviewsapp.middleware import StatisticsLoggingMiddleware
 
 DjangoSchema = schemas.get(django.get_version())
 
@@ -56,7 +55,6 @@
     rnr.token_cache_expiry_hours = IntConfigOption(default=4)
     rnr.reviewsapp_media_root = StringConfigOption()
     rnr.allow_multiple_reviews_for_testing = BoolConfigOption(default=False)
-    rnr.commercial_origins = LinesConfigOption(item=StringConfigOption())
 
     # Launchpad
     launchpad = ConfigSection()
@@ -69,3 +67,8 @@
     piston = ConfigSection()
     piston.oauth_data_store = StringConfigOption()
 
+    # Softwarecenter agent.
+    sca = ConfigSection()
+    sca.sca_host_url = StringConfigOption(
+        default='https://software-center.ubuntu.com/')
+    sca.sca_apps_cache_timeout = IntConfigOption(default=3600)

=== modified file 'src/reviewsapp/forms.py'
--- src/reviewsapp/forms.py	2011-03-15 09:47:29 +0000
+++ src/reviewsapp/forms.py	2011-03-15 09:47:29 +0000
@@ -128,14 +128,14 @@
         distroseries = self.cleaned_data['distroseries']
         arch_tag=self.cleaned_data['arch_tag']
 
-        require_lp_check = False
+        require_repository_check = False
         repository = None
         # First we grab the repository - if it exists.
         try:
             repository = Repository.objects.get(
                 origin=origin, distroseries=distroseries)
         except Repository.DoesNotExist:
-            require_lp_check = True
+            require_repository_check = True
 
         if repository is not None:
             # Check whether there are any existing reviews for this
@@ -148,16 +148,20 @@
             if review_count == 0:
                 # This is the first review for this software_item in the
                 # repository with the given arch.
-                require_lp_check = True
+                require_repository_check = True
 
-        if require_lp_check:
-            valid_in_lp = WebServices().lp_verify_packagename_in_repository(
+        if require_repository_check:
+            ws = WebServices()
+            valid_in_lp = ws.lp_verify_packagename_in_repository(
                 package_name, origin, distroseries, arch_tag=arch_tag)
 
             if not valid_in_lp:
-                raise forms.ValidationError(
-                    ': package {0} not in {1} {2} for {2}'.format(
-                        package_name, origin, distroseries, arch_tag))
+                valid_in_sca = ws.sca_verify_packagename_in_repository(
+                    package_name, origin, distroseries, arch_tag=arch_tag)
+                if not valid_in_sca:
+                    raise forms.ValidationError(
+                        ': package {0} not in {1} {2} for {2}'.format(
+                            package_name, origin, distroseries, arch_tag))
 
         # Now we know the given data corresponds to a published binary
         # on launchpad, so we can populate the cleaned data, creating

=== modified file 'src/reviewsapp/preflight.py'
--- src/reviewsapp/preflight.py	2011-03-04 15:11:42 +0000
+++ src/reviewsapp/preflight.py	2011-03-15 09:47:29 +0000
@@ -63,7 +63,7 @@
     def check_launchpad_api_access(self):
         """
         Make sure that the access to the Launchpad API (anonymous) works.
-        
+
         """
         # Pull one data item from Launchpad
         bug = WebServices().launchpad_service.bugs[1]
@@ -76,4 +76,9 @@
         parser = settings.__CONFIGGLUE_PARSER__
         return parser.is_valid()
 
+    def check_sca_validation(self):
+        pubs = WebServices().get_sca_publishings_for('maverick', 'i386')
+        return type(pubs) == dict
+
+
 register(RNRPreflight)

=== modified file 'src/reviewsapp/tests/factory.py'
--- src/reviewsapp/tests/factory.py	2011-03-09 11:20:36 +0000
+++ src/reviewsapp/tests/factory.py	2011-03-15 09:47:29 +0000
@@ -25,6 +25,7 @@
     ]
 
 
+import os
 from datetime import datetime
 from itertools import count
 
@@ -198,6 +199,10 @@
             token.save()
         return token, consumer
 
+    def get_test_file(self, file_name):
+        return os.path.join(os.path.dirname(__file__), 'test_data',
+                            file_name)
+
 
 class TestCaseWithFactory(TestCase, TestToolsTestCase):
 

=== added directory 'src/reviewsapp/tests/test_data'
=== added file 'src/reviewsapp/tests/test_data/software_center_apps.json'
--- src/reviewsapp/tests/test_data/software_center_apps.json	1970-01-01 00:00:00 +0000
+++ src/reviewsapp/tests/test_data/software_center_apps.json	2011-03-15 09:47:29 +0000
@@ -0,0 +1,135 @@
+[
+    {
+        "archive_id": "commercial-ppa-uploaders/fluendo-dvd",
+        "signing_key_id": "1024R/75254D99",
+        "description": "Play DVD-Videos\r\n\r\nFluendo DVD Player is a software application specially designed to\r\nreproduce DVD on Linux/Unix platforms, which provides end users with\r\nhigh quality standards.\r\n\r\nThe following features are provided:\r\n* Full DVD Playback\r\n* DVD Menu support\r\n* Fullscreen support\r\n* Dolby Digital pass-through\r\n* Dolby Digital 5.1 output and stereo downmixing support\r\n* Resume from last position support\r\n* Subtitle support\r\n* Audio selection support\r\n* Multiple Angles support\r\n* Support for encrypted discs\r\n* Multiregion, works in all regions\r\n* Multiple video deinterlacing algorithms",
+        "package_name": "fluendo-dvd",
+        "series": {
+            "maverick": [
+                "i386",
+                "amd64"
+            ]
+        },
+        "price": "24.95",
+        "icon_data": "...",
+        "screenshot_url": "http://software-center.ubuntu.com/screenshots/f/fluendo-dvd-maverick.png",
+        "archive_root": "https://private-ppa.launchpad.net/",
+        "tos_url": "http://software-center.ubuntu.com/tos/fluendo-eula.html",
+        "categories": "GNOME;GTK;Video;Player;Application;AudioVideo",
+        "name": "Fluendo DVD Player"
+    },
+    {
+        "archive_id": "commercial-ppa-uploaders/fluendo-plugins",
+        "signing_key_id": "1024R/75254D99",
+        "description": "Complete set of multimedia plugins provided by Fluendo. \r\nThis product contains plug-ins which allow you to play certain proprietary audio and video formats. These plug-ins are not included in the default Ubuntu distribution because they are not free software. Ubuntu is driven by strong support for the principles of free and open source software, and these principles govern what we can and will include in Ubuntu. However, we recognise the common need for plug-ins such as these, and offer them here to provide a safe and legal way for our users to play back video and audio in the formats they wish. These plug-ins automatically integrate with GStreamer, the multimedia framework that Ubuntu uses for video and sound applications.\r\n\r\nThe Fluendo Complete Playback Pack includes all the plug-ins you need in a single package. This pack includes:\r\n\r\nWindows Media Audio Decoder Stereo (Windows Media 7, 8, 9, 10, Pro, Lossless and Speech)\r\nWindows Media Video Decoder (Windows Media 7, 8, 9 and VC1)\r\nWindows Media ASF Demuxer\r\nWindows Media MMS Networking\r\nMPEG2 Video Decoder\r\nMPEG4 Part 2 Video Decoder\r\nDivX 3.11 Alpha ;-) Video Decoder\r\nH.264/AVC Video Decoder\r\nMPEG2 Program Stream and Transport Stream demuxer\r\nMPEG4 ISO Demuxer\r\nMP3 Audio Decoder\r\nAAC Audio Decoder\r\nLPCM Audio Decoder\r\nVDPAU/VAAPI\r\nClutter support to render hardware accelerated video in Clutter 3D Texture\r\nAC3 Audio Decoder (Dolby Digital) for Totem Media Player only\r\niLBC Audio Decoder\r\nADPCM Audio Decoder",
+        "package_name": "gstreamer0.10-fluendo-plugins",
+        "series": {
+            "maverick": [
+                "i386",
+                "amd64"
+            ]
+        },
+        "price": "34.95",
+        "icon_data": "...",
+        "screenshot_url": "",
+        "archive_root": "https://private-ppa.launchpad.net/",
+        "tos_url": "",
+        "categories": "AudioVideo;Audio;Music",
+        "name": "Fluendo Complete Playback Pack"
+    },
+    {
+        "archive_id": "commercial-ppa-uploaders/brukkon",
+        "signing_key_id": "1024R/75254D99",
+        "description": "puzzle game inspired by sokoban\r\n\r\nBrukkon (Old High German: to bridge a gap) is a challenging logic puzzle\r\ngame available for Linux. To solve one of the 35 challenging puzzle levels,\r\nyou have to guide a little robot to its spare parts. This version includes 5\r\nextra levels exclusive for Ubuntu users. \r\n\r\nYou do this by moving the robot over platforms and removing barricades in\r\nits way. The movable ground tiles keep moving in the direction they were sent,\r\nuntil they are stopped by either another tile or by the level borders. Some\r\nof them can go in all four directions, some of them are limited to horizontal\r\nor vertical movement. The robot can stop on non colored movable tiles and be\r\nmoved with the puzzle element to overcome water areas - or bridge a gap, which is\r\nwhere the name comes from. The robot can not go onto colored puzzle tiles,\r\nsometimes you need to remove the tiles by moving four or more puzzle tiles\r\nof the same color in a row to remove them. Some ground tiles are broken and\r\nvanish after the robot moved over them once - so be sure to move wise, or\r\nthe puzzle could become unsolvable, although you can restart at any time and as\r\noften as you like.\r\n\r\nAfter successfully solving a puzzle, you can submit the number of moves and\r\nthe time you took to a online high score and compare it with other players.\r\n\r\nThe real challenge comes by trying to reduce the number of moves you need\r\nto solve the puzzle levels. You can reduce the number of moves by moving more\r\nplatforms simultaneously and use them to stop other platforms by driving\r\nthem in their way.\r\n\r\nBrukkon also features beautiful relaxed music and several graphics themes\r\nwith day and night and different weather situations. Two different camera\r\npositions can be freely configured and you can switch quickly between them by tapping\r\nthe space bar.",
+        "package_name": "brukkon",
+        "series": {
+            "maverick": [
+                "i386",
+                "amd64"
+            ]
+        },
+        "price": "7.00",
+        "icon_data": "...",
+        "screenshot_url": "http://software-center.ubuntu.com/screenshots/b/brukkon-maverick.png",
+        "archive_root": "https://private-ppa.launchpad.net/",
+        "tos_url": "",
+        "categories": "Game;LogicGame",
+        "name": "Brukkon"
+    },
+    {
+        "archive_id": "commercial-ppa-uploaders/vendetta-online",
+        "signing_key_id": "1024R/75254D99",
+        "description": "3D space combat MMORPG\r\nVendetta Online is a 3D space combat MMORPG. This MMO permits thousands of players to interact as the pilots of spaceships in a vast universe. Users may build their characters in any direction they desire, becoming rich captains of industry, military heroes, or outlaws.\r\n\r\nA fast-paced, realtime \"twitch\" style combat model gives intense action, coupled with the backdrop of RPG gameplay in a massive online galaxy. Three major player factions form a delicate balance of power, with several NPC sub-factions creating situations of economic struggle, political intrigue and conflict. The completely persistent universe and detailed storyline add to the depth of immersion, resulting in a unique online experience.",
+        "package_name": "vendetta-online",
+        "series": {
+            "maverick": [
+                "i386",
+                "amd64"
+            ]
+        },
+        "price": "0.00",
+        "icon_data": "...",
+        "screenshot_url": "http://software-center.ubuntu.com/screenshots/v/vendetta-online-maverick.png",
+        "archive_root": "https://private-ppa.launchpad.net/",
+        "tos_url": "",
+        "categories": "Game;RolePlaying",
+        "name": "Vendetta Online"
+    },
+    {
+        "archive_id": "commercial-ppa-uploaders/fluendo-wmv-plugins",
+        "signing_key_id": "1024R/75254D99",
+        "description": "Plug-ins for the most common Windows Media formats. \r\nThis product contains plug-ins which allow you to play certain proprietary audio and video formats. These plug-ins are not included in the default Ubuntu distribution because they are not free software. Ubuntu is driven by strong support for the principles of free and open source software, and these principles govern what we can and will include in Ubuntu. However, we recognise the common need for plug-ins such as these, and offer them here to provide a safe and legal way for our users to play back video and audio in the formats they wish. These plug-ins automatically integrate with GStreamer, the multimedia framework that Ubuntu uses for video and sound applications.\r\n\r\nThe Fluendo Windows Media Pack provides plug-ins for all the common Windows Media formats. This pack includes:\r\n\r\nWindows Media Audio Decoder (Windows Media 7, 8, 9, 10, Pro, Lossless and Speech)\r\nWindows Media Video Decoder (Windows Media 7, 8, 9 and VC1)\r\nWindows Media MMS Protocol Support\r\nWindows Media ASF Demuxer\r\nMP3 Audio decoder\r\nLPCM Audio decoder",
+        "package_name": "gstreamer0.10-fluendo-plugins-wmv",
+        "series": {
+            "maverick": [
+                "i386",
+                "amd64"
+            ]
+        },
+        "price": "24.95",
+        "icon_data": "...",
+        "screenshot_url": "",
+        "archive_root": "https://private-ppa.launchpad.net/",
+        "tos_url": "",
+        "categories": "AudioVideo;Audio;Music",
+        "name": "Fluendo Windows Media Pack"
+    },
+    {
+        "archive_id": "commercial-ppa-uploaders/world-of-goo",
+        "signing_key_id": "1024R/75254D99",
+        "description": "Physics based puzzle/construction game.\r\nDrag and drop living, squirming, talking globs of goo to build structures, bridges, cannonballs, zeppelins, and giant tongues. The millions of innocent goo balls that live in the beautiful World of Goo are curious to explore.\r\n\r\nBut they don't know that they are in a game, or that they are extremely delicious. The most addicting and awe-inspiring puzzle game will set you on an adventure that you'll never forget!",
+        "package_name": "worldofgoo",
+        "series": {
+            "maverick": [
+                "i386",
+                "amd64"
+            ]
+        },
+        "price": "19.95",
+        "icon_data": "...",
+        "screenshot_url": "http://software-center.ubuntu.com/screenshots/w/worldofgoo-maverick.png",
+        "archive_root": "https://private-ppa.launchpad.net/",
+        "tos_url": "",
+        "categories": "Game;Simulation",
+        "name": "World of Goo"
+    },
+    {
+        "archive_id": "commercial-ppa-uploaders/illumination",
+        "signing_key_id": "1024R/75254D99",
+        "description": "Visually create desktop, mobile and web apps.\r\nIllumination Software Creator allows anyone to create their own software applications... without writing a single line of \u201ccode\u201d.\r\n\r\nThe idea is simple: Arrange colorful building blocks of functionality however you like to create your own, unique, piece of software. No reading large computer programming books. No steep learning curve.\r\n\r\nFrom one, 100% visual project you can build the following:\r\n\r\n- Python/GTK Desktop apps\r\n- Python GTK Maemo (N900) apps\r\n- Android apps\r\n- Adobe Flash rich web apps",
+        "package_name": "illumination",
+        "series": {
+            "maverick": [
+                "i386",
+                "amd64"
+            ]
+        },
+        "price": "39.85",
+        "icon_data": "...",
+        "screenshot_url": "http://software-center.ubuntu.com/screenshots/i/illumination-maverick.png",
+        "archive_root": "https://private-ppa.launchpad.net/",
+        "tos_url": "",
+        "categories": "GNOME;Application;Development;",
+        "name": "Illumination Software Creator"
+    }
+]

=== modified file 'src/reviewsapp/tests/test_handlers.py'
--- src/reviewsapp/tests/test_handlers.py	2011-03-15 09:47:29 +0000
+++ src/reviewsapp/tests/test_handlers.py	2011-03-15 09:47:29 +0000
@@ -476,7 +476,7 @@
         }
         super(SubmitReviewHandlerTestCase, self).setUp()
 
-    def _post_new_review(self, data, user=None, lp_verify_result=True):
+    def _post_new_review(self, data, user=None, verify_result=True):
         # Post a review as an authenticated user.
         url = reverse('rnr-api-reviews')
 
@@ -484,15 +484,20 @@
             user = self.factory.makeUser()
         self.client.login(username=user.username, password='test')
 
+        # Ensure we don't hit the network for our tests.
         is_authed_fn = 'reviewsapp.auth.SSOOAuthAuthentication.is_authenticated'
         lp_verify_fn = ('reviewsapp.utilities.WebServices.'
                         'lp_verify_packagename_in_repository')
+        sca_verify_fn = ('reviewsapp.utilities.WebServices.'
+                         'sca_verify_packagename_in_repository')
         with patch(is_authed_fn) as mock_is_authenticated:
             mock_is_authenticated.return_value = True
             with patch(lp_verify_fn) as mock_lp_verify_method:
-                mock_lp_verify_method.return_value = lp_verify_result
-                response = self.client.post(
-                    url, data=data, content_type='application/json')
+                mock_lp_verify_method.return_value = verify_result
+                with patch(sca_verify_fn) as mock_sca_verify_method:
+                    mock_sca_verify_method.return_value = verify_result
+                    response = self.client.post(
+                        url, data=data, content_type='application/json')
         return response
 
     def test_bogus_data(self):
@@ -550,7 +555,7 @@
             package_name='inkscape').count())
 
         response = self._post_new_review(
-            simplejson.dumps(self.required_data), lp_verify_result=False)
+            simplejson.dumps(self.required_data), verify_result=False)
 
         self.assertEqual(httplib.BAD_REQUEST, response.status_code)
         self.assertEqual(0, Repository.objects.filter(

=== modified file 'src/reviewsapp/tests/test_preflight.py'
--- src/reviewsapp/tests/test_preflight.py	2011-02-23 13:48:45 +0000
+++ src/reviewsapp/tests/test_preflight.py	2011-03-15 09:47:29 +0000
@@ -1,49 +1,78 @@
-# import paymentservice
-# import testconsumer
+#   -*- coding: utf-8 -*-
+#   This file is part of Software Center Ratings and Reviews
+#   Copyright (C) 2010-2011 Canonical Ltd.
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for the preflight integration."""
+
+from __future__ import (
+    absolute_import,
+    with_statement,
+    )
+
+__metaclass__ = type
+__all__ = [
+    'TestPreflight',
+    ]
+
+from mock import patch
 
 from django.contrib.auth.models import User, Group
-from django.test import TestCase
-
-
-class TestPreflight(TestCase):
-
-    def setUp(self):
-        self.user = User.objects.create_user(username='test',
-            email='[e-mail]', password='test')
-        self.group =  Group.objects.get(name='rnr-developers')
-        self.url = '/preflight/'
+
+from reviewsapp.tests.factory import TestCaseWithFactory
+
+
+class TestPreflight(TestCaseWithFactory):
+
+    def _request_preflight(self, authenticated=True, user=None):
+        if authenticated:
+            if user is None:
+                user = self.factory.makeUser()
+                group =  Group.objects.get(name='rnr-developers')
+                user.groups.add(group)
+            login = self.client.login(username=user.username, password='test')
+            self.assertTrue(login, 'Could not log in')
+
+        with patch('preflight.models.gather_checks') as mock_gather_checks:
+            mock_gather_checks.return_value = []
+            response = self.client.get('/preflight/')
+        return response
 
     def test_anonymous(self):
-        response = self.client.get(self.url)
+        response = self._request_preflight(authenticated=False)
 
         self.assertEqual(404, response.status_code)
 
     def test_logged_in_no_group(self):
-        login = self.client.login(username='test', password='test')
-        self.assertTrue(login, 'Could not log in')
+        user = self.factory.makeUser(username='test')
 
-        response = self.client.get(self.url)
+        response = self._request_preflight(user=user)
 
         self.assertEqual(404, response.status_code)
 
     def test_logged_in_wrong_group(self):
         g = Group.objects.create(name='someothergroup')
-        self.user.groups.add(g)
-        self.user.save()
-        login = self.client.login(username='test', password='test')
-        self.assertTrue(login)
+        user = self.factory.makeUser(username='test')
+        user.groups.add(g)
 
-        response = self.client.get(self.url)
+        response = self._request_preflight(user=user)
 
         self.assertEqual(404, response.status_code)
 
     def test_success(self):
-        self.user.groups.add(self.group)
-        self.user.save()
-        login = self.client.login(username='test', password='test')
-        self.assertTrue(login)
-
-        response = self.client.get(self.url)
+        response = self._request_preflight()
 
         self.assertEqual(200, response.status_code)
         libs = set([x['name'] for x in response.context[0]['versions']])

=== modified file 'src/reviewsapp/tests/test_utilities.py'
--- src/reviewsapp/tests/test_utilities.py	2011-03-15 09:47:29 +0000
+++ src/reviewsapp/tests/test_utilities.py	2011-03-15 09:47:29 +0000
@@ -20,10 +20,11 @@
 
 __metaclass__ = type
 __all__ = [
+    'FullClaimedIdTestCase',
     'IdentityProviderTestCase',
     'InvalidatePaginatedReviewsTestCase',
     'LaunchpadTestCase',
-    'FullClaimedIdTestCase',
+    'SCATestCase',
     ]
 
 import os
@@ -32,7 +33,6 @@
 from django.conf import settings
 from django.core.cache import cache
 from django.core.urlresolvers import reverse
-from django.http import HttpRequest
 from launchpadlib.errors import HTTPError
 from mock import patch, Mock
 from mockssoservice.mockserver import MockSSOServer, new_token
@@ -182,17 +182,6 @@
             status='Published', exact_match=True)
         self.assertTrue(result)
 
-    def test_commercial_package(self):
-        lp_api, ubuntu, archive = self._make_mock_launchpad()
-
-        with patch_settings(COMMERCIAL_ORIGINS=['lp-ppa-commercial-one']):
-            result = self._verify_package(lp_api, 'anything',
-                'lp-ppa-commercial-one', 'anything', 'anything')
-
-        # XXX The result should not always be true... we need a way to
-        # know the content of commercial ppas.
-        self.assertTrue(result)
-
     def test_unknown_origin(self):
         lp_api, ubuntu, archive = self._make_mock_launchpad()
 
@@ -244,6 +233,74 @@
             "foobar", "ubuntu", "lucid", 'i386')
 
 
+class SCATestCase(TestCaseWithFactory):
+
+    def _request_sca_pubs_for(self, distroseries, arch_tag, disable_cache=True):
+        with patch('urllib.urlretrieve') as mock_urlretrieve:
+            mock_urlretrieve.return_value = (
+                self.factory.get_test_file('software_center_apps.json'), None)
+            if disable_cache:
+                with patch('django.core.cache') as mock_cache:
+                    mock_cache.get.return_value = False
+                    published_apps = WebServices().get_sca_publishings_for(
+                        distroseries, arch_tag)
+            else:
+                published_apps = WebServices().get_sca_publishings_for(
+                    distroseries, arch_tag)
+        return published_apps, mock_urlretrieve
+
+    def test_get_sca_publishings(self):
+        published_apps, ignored = self._request_sca_pubs_for(
+            'maverick', 'i386')
+
+        self.assertEqual({
+            'lp-ppa-commercial-ppa-uploaders-brukkon': 'brukkon',
+            'lp-ppa-commercial-ppa-uploaders-fluendo-dvd': 'fluendo-dvd',
+            'lp-ppa-commercial-ppa-uploaders-fluendo-plugins':
+                'gstreamer0.10-fluendo-plugins',
+            'lp-ppa-commercial-ppa-uploaders-fluendo-wmv-plugins':
+                'gstreamer0.10-fluendo-plugins-wmv',
+            'lp-ppa-commercial-ppa-uploaders-illumination': 'illumination',
+            'lp-ppa-commercial-ppa-uploaders-vendetta-online': 'vendetta-online',
+            'lp-ppa-commercial-ppa-uploaders-world-of-goo': 'worldofgoo',
+            }, published_apps)
+
+    def test_retrieved_url(self):
+        with patch_settings(SCA_HOST_URL='http://example.com/'):
+            ignored, mock_urlretrieve = self._request_sca_pubs_for(
+                'natty', 'amd64')
+
+        mock_urlretrieve.assert_called_with(
+            'http://example.com/apps/en/ubuntu/natty/amd64/')
+
+    def test_get_sca_publishings_cached(self):
+        published_apps, mock_url_retrieve = self._request_sca_pubs_for(
+            'maverick', 'i386', disable_cache=False)
+        published_apps, mock_urlretrieve = self._request_sca_pubs_for(
+            'maverick', 'i386', disable_cache=False)
+
+        self.assertEqual(0, mock_urlretrieve.call_count)
+
+    def _request_sca_verify(self, pkgname, origin, distroseries, arch_tag):
+        with patch('urllib.urlretrieve') as mock_urlretrieve:
+            mock_urlretrieve.return_value = (
+                self.factory.get_test_file('software_center_apps.json'), None)
+            ws = WebServices()
+            return ws.sca_verify_packagename_in_repository(
+                pkgname, origin, distroseries, arch_tag)
+
+    def test_sca_verify_packagename(self):
+        self.assertTrue(self._request_sca_verify(
+            'brukkon', 'lp-ppa-commercial-ppa-uploaders-brukkon',
+            'maverick', 'i386'))
+        self.assertFalse(self._request_sca_verify(
+            'fluendo-dvd', 'lp-ppa-commercial-ppa-uploaders-brukkon',
+            'maverick', 'i386'))
+        self.assertFalse(self._request_sca_verify(
+            'brukkon', 'lp-ppa-commercial-ppa-uploaders-doesnt-exist',
+            'maverick', 'i386'))
+
+
 class InvalidatePaginatedReviewsTestCase(TestCaseWithFactory):
     def _url_for_package(self, package_name, origin='ubuntu',
         distro_series='lucid', language='en', version='1.0', page=None):

=== modified file 'src/reviewsapp/utilities.py'
--- src/reviewsapp/utilities.py	2011-03-15 09:47:29 +0000
+++ src/reviewsapp/utilities.py	2011-03-15 09:47:29 +0000
@@ -27,7 +27,6 @@
     ]
 
 import logging
-import os
 import urllib
 from httplib2 import ServerNotFoundError
 
@@ -37,6 +36,8 @@
 from django.http import HttpRequest
 from django.utils.cache import get_cache_key
 from django.utils.http import urlquote_plus
+from django.utils import simplejson
+
 from launchpadlib.launchpad import Launchpad
 from launchpadlib.uris import lookup_service_root
 from lazr.restfulclient.authorize import BasicHttpAuthorizer
@@ -120,10 +121,10 @@
     def _fake_validate_token(self, token, openid_identifier, signature):
         """ This is a version of validate_token that gets the
             token_secret, consumer_secret from the plaintext signature.
-            
+
             It will break once we use a real signature for oauth, but
             its very useful for testing as it does not require the special
-            priviledges required for the call to 
+            priviledges required for the call to
             identity_provider.authentications.validate_token()
 
             The token can still be validated (and will be) with a
@@ -159,7 +160,7 @@
 
     def lp_verify_packagename_in_repository(self, pkgname, origin, distroseries,
                                             arch_tag):
-        """Verify that a given package exists in a distroseries.
+        """Verify that a given package exists in a distroseries on LP.
 
         :param pkgname: The name of the package to check.
         :param origin: The repository origin identifier.
@@ -177,24 +178,6 @@
             app_review_board = self.launchpad_service.people[
                 'app-review-board']
             archive = app_review_board.getPPAByName(name='ppa')
-        elif origin in settings.COMMERCIAL_ORIGINS:
-            # XXX 2011-03-11 michaeln bug=733170 PPA origins are
-            # currently ambiguous.
-            # We should check this in a way that doesn't require
-            # settings, either pulling the data from SCA, or request
-            # that LP updates IArchive to allow public access to
-            # getPublishedBinaries() for commercial PPAs (but not
-            # private-only).
-            # XXX - chat with achuni about options - dict in settings?
-            # Perhaps for now just a non-configglue setting with a
-            # complex dict:
-            # 'lp-ppa-commercial-ppa-uploaders-fluendo-dvd': {
-            #      'package_name': 'fluendo-dvd',
-            #       'releases': {
-            #           'natty': ['i386', 'amd64'],
-            #           ...
-            # And then we can make this available on SCA as json/api.
-            return True
         else:
             return False
 
@@ -218,6 +201,62 @@
                 return True
         return False
 
+    def sca_verify_packagename_in_repository(self, pkgname, origin,
+                                             distroseries, arch_tag):
+        """Verify that a given package exists in a distroseries on SCA.
+
+        :param pkgname: The name of the package to check.
+        :param origin: The repository origin identifier.
+        :param distroseries: The name of distribution series.
+        :param arch_tag: The machine architecture (i386, amd64...)
+        :return: Whether the package was found or not.
+        :rtype: bool
+        """
+        sca_publishings = self.get_sca_publishings_for(distroseries, arch_tag)
+        if origin in sca_publishings:
+            # XXX 2011-03-11 michaeln bug=733170 PPA origins are
+            # currently ambiguous.
+            published_apps = self.get_sca_publishings_for(distroseries, arch_tag)
+            return pkgname == published_apps[origin]
+
+        return False
+
+    def get_sca_publishings_for(self, distroseries, arch_tag):
+        """A helper that builds a dict of publishings for sca-sold apps.
+
+        XXX michaeln 2011-03-14 bug=734747 Optional parms for available_apps.
+        It would be great if we could just pull /apps/en/ubuntu/ and use
+        each items 'series' dict to populate this, rather than pulling each
+        distroserie/arch separately. If we can assume that an app sold via
+        softwarecenter will always be available for maverick i386, then we
+        could do just the one call too.
+        """
+        cache_key = 'sca_{0}_{1}'.format(distroseries, arch_tag)
+        result = cache.get(cache_key)
+        if result is not None:
+            return result
+
+        # XXX michaeln 2011-03-14 Update to use sca piston client.
+        # Once production SCA includes the piston client version we can
+        # use that instead. At time of writing the following url works
+        # on staging but not production sca:
+        #     api/2.0/applications/en/ubuntu/maverick/i386/
+        filename, headers = urllib.urlretrieve(
+            settings.SCA_HOST_URL +
+            'apps/en/ubuntu/{0}/{1}/'.format(distroseries, arch_tag))
+
+        with open(filename, 'r') as sca_apps_file:
+            sca_apps = simplejson.load(sca_apps_file)
+
+        # We ensure the keys match Launchpad's current (ambiguous)
+        # origin identifiers - Launchpad bug 733170.
+        app_names = dict([(
+            'lp-ppa-' + app['archive_id'].replace('/', '-'),
+            app['package_name'],
+            ) for app in sca_apps])
+        cache.set(cache_key, app_names, settings.SCA_APPS_CACHE_TIMEOUT)
+        return app_names
+
 
 def cache_key_for_url(url):
     """Return the key used by django's caching system for a (non-varied) url."""