Merge lp:~ivoks/ubuntu-reports/private-ppa into lp:ubuntu-reports

[Ante Karamatić]

This branch adds feautre of inspecting private PPAs. For example:

gather-versions.py -a MyApp -u supersecret grizzly

ca-versions.py -r grizzly -u supersecret

In this example, 'supersecret' is user's Private PPA or a PPA from a private LP team. 'MyApp' is application name that LP library would use to get OAuth token.

In addition, this branch also fixes some PEP8 warnings and errors.

Unmerged revisions

105. By Ante Karamatić on 2013-08-23

Add support for private PPA and LP authentication for cloud-archive
set of scripts.

=== modified file 'server/cloud-archive/version-tracker/ca-versions.py'
--- server/cloud-archive/version-tracker/ca-versions.py	2013-04-30 15:45:47 +0000
+++ server/cloud-archive/version-tracker/ca-versions.py	2013-08-23 10:35:34 +0000
@@ -49,7 +49,11 @@
 
 def load_sets(json_dir, release):
     # this list determines which pockets to display, and in what order.
-    sets = ['ubuntu', 'staging', 'proposed', 'updates']
+    if opts.lp_user:
+        user_set = ('%s-staging' % opts.lp_user)
+        sets = ['ubuntu', 'staging', 'proposed', 'updates', user_set]
+    else:
+        sets = ['ubuntu', 'staging', 'proposed', 'updates']
     i = 1
     package_sets = {}
     for s in sets:
@@ -142,6 +146,9 @@
                   action='store_true', default=False,
                   help='Ensure Ubuntu pockets do not contain newer '\
                        'packages than what is at least in CA staging.')
+parser.add_option('-u', '--user', action='store', dest='lp_user',
+                  default=None, type='string',
+                  help='Additional staging PPA owned by this user')
 (opts, args) = parser.parse_args()
 
 if not os.path.exists(opts.json_dir):

=== modified file 'server/cloud-archive/version-tracker/gather-versions.py'
--- server/cloud-archive/version-tracker/gather-versions.py	2013-05-29 17:40:31 +0000
+++ server/cloud-archive/version-tracker/gather-versions.py	2013-08-23 10:35:34 +0000
@@ -35,6 +35,12 @@
 parser.add_option('-o', '--output_dir', action='store', dest='out_dir',
                   default=os.path.join(os.getenv('HOME'), '.ca-versions'),
                   help='Directory to dump JSON (Default: $HOME/.ca-versions)')
+parser.add_option('-u', '--user', action='store', dest='lp_user',
+                  default=None, type='string',
+                  help='Additional staging PPA owned by this user')
+parser.add_option('-a', '--auth', action='store', dest='lp_auth',
+                  default=None, type='string',
+                  help='Authenticate against LP as this application')
 (opts, args) = parser.parse_args()
 
 if len(args) == 0:
@@ -53,6 +59,7 @@
 conn["lp"] = None
 conn["ubuntu"] = None
 
+
 def version_from_packages_url(packages, package):
     packages = packages.split('\n')
     loc = 0
@@ -90,13 +97,15 @@
 
     return s or p or None
 
+
 def versions_from_packages(os_release, pocket, pkgs):
     url = common.packages_url(os_release, pocket)
     req = httplib2.Http()
 
     resp, content = req.request(url, "GET")
     if resp.status != 200:
-        logging.warn('Could not fetch Packages from %s (%s)' % (url, resp.status))
+        logging.warn('Could not fetch Packages from %s (%s)' % (url,
+                     resp.status))
         return {}
 
     packages = content
@@ -107,28 +116,37 @@
 
     return versions
 
+
 def init_lp():
     if not conn['lp']:
         logging.info("Initializing connection to LP...")
-        conn['lp'] = Launchpad.login_anonymously('openstack', 'production')
+        if not opts.lp_auth:
+            conn['lp'] = Launchpad.login_anonymously('openstack', 'production')
+        else:
+            conn['lp'] = Launchpad.login_with(opts.lp_auth, 'production')
     if not conn['ubuntu']:
         conn['ubuntu'] = conn['lp'].distributions['ubuntu']
     return conn['lp']
 
-def query_ca_ppa(ppa='folsom-staging', release='precise'):
+
+def query_ppa(lp_user='ubuntu-cloud-archive', ppa='folsom-staging',
+              release='precise'):
     init_lp()
-    ppa = conn['lp'].people['ubuntu-cloud-archive'].getPPAByName(name=ppa)
+    ppa = conn['lp'].people[lp_user].getPPAByName(name=ppa)
     distro = ppa.distribution.getSeries(name_or_version=release)
     out = {}
-    for pkg in ppa.getPublishedSources(distro_series=distro, status='Published'):
+    for pkg in ppa.getPublishedSources(distro_series=distro,
+                                       status='Published'):
         out[pkg.source_package_name] = pkg.source_package_version
     return out
 
+
 def get_ubuntu_pkg_vers(pkg, release):
     '''
     get pkg version in ubuntu with pocket priority:
         (Security > Updates > Release)
-    returns a tuple: (pocket, version) or (None, None) if pkg doesn't exist in Ubuntu.
+    returns a tuple: (pocket, version) or (None, None) if pkg doesn't exist
+    in Ubuntu.
     '''
     init_lp()
     archive, partner = conn['ubuntu'].archives
@@ -158,6 +176,7 @@
         return None, None
     return 'release', rel
 
+
 def query_ubuntu(pkgs, release):
     '''return a dict mapping all pkgs to versions in ubuntu for a
        given release.
@@ -176,12 +195,22 @@
 # in other places.
 logging.info("Querying package list and versions from staging PPA.")
 staging_ppa = '%s-staging' % os_release
-staging_versions = query_ca_ppa(ppa=staging_ppa,
-                                release=stable_rel)
+staging_versions = query_ppa(ppa=staging_ppa,
+                             release=stable_rel)
 f = open(os.path.join(opts.out_dir, '%s_staging_versions' % os_release), 'w+')
 f.write(json.dumps(staging_versions))
 f.close()
 
+if opts.lp_user:
+    logging.info("Querying package list and versions from user's staging PPA.")
+    staging_ppa = '%s-staging' % os_release
+    user_staging_versions = query_ppa(lp_user=str(opts.lp_user), ppa=staging_ppa,
+                                 release=stable_rel)
+    f = open(os.path.join(opts.out_dir, '%s_%s-staging_versions' % (os_release,
+                          opts.lp_user)), 'w+')
+    f.write(json.dumps(user_staging_versions))
+    f.close()
+
 # with the names of the packages published to the staging ppa, we can determine
 # what we need to track in ubuntu.
 logging.info("Querying Ubuntu versions for all packages.")