Merge lp:~smoser/uvtool/sm-features00 into lp:~uvtool-dev/uvtool/trunk

[Scott Moser]

smoser improvements

This does:
 * adds execute to bin/uvt-simplestreams-libvirt
 * adds a 'uvtool.ubuntu' that knows some thigns about ubuntu specifically
   this means the user can now say "trusty" rather than "release=trusty".
   Also , if user says trusty and doesn't specify mirror then it picks daily stream.
 * prefers keys via ssh-add -L to ~/.ssh/id_rsa.pub

[lp:~smoser/uvtool/sm-features00]

70. By Scott Moser on 2013-12-13

fix incorrect variable usage

Unmerged revisions

70. By Scott Moser on 2013-12-13

fix incorrect variable usage

69. By Scott Moser on 2013-12-12

bin/uvt-simplestreams-libvirt: make executable

68. By Scott Moser on 2013-12-12

add awareness of ubuntu releases

knowing about ubuntu releases by name allows shorter syntax and more complex
behavior.

Now the user can refer to a supported ubuntu release just by its short name:
 uvt-simplestreams-libvirt sync trusty arch=amd64

Additionally, if the release specified is ubuntu development release and
no mirror is provided, then the daily builds are chosen.

67. By Scott Moser on 2013-12-12

support reading keys from 'ssh-add -L'

'ssh-add -L' provides ssh keys that the user is authenticated with.
If it returns success and has output, then use it as the source
rather than ~/.ssh/id_rsa.pub (which doesn't exist for me).

=== modified file 'bin/uvt-kvm'
--- bin/uvt-kvm	2013-11-12 15:02:01 +0000
+++ bin/uvt-kvm	2013-12-13 14:30:46 +0000
@@ -46,6 +46,7 @@
 import uvtool.libvirt
 import uvtool.libvirt.simplestreams
 import uvtool.wait
+import uvtool.ubuntu
 
 DEFAULT_TEMPLATE = '/usr/share/uvtool/libvirt/template.xml'
 POOL_NAME = 'uvtool'
@@ -86,7 +87,19 @@
 
 def get_ssh_authorized_keys(filename):
     if filename is None:
-        filename = os.path.join(os.environ['HOME'], '.ssh', 'id_rsa.pub')
+        try:
+            with open("/dev/null") as fpnull:
+                output = subprocess.check_output(['ssh-add', '-L'],
+                                                 stderr=fpnull)
+        except subprocess.CalledProcessError:
+            pass
+
+        output = output.strip()
+        if output:
+            return output.splitlines()
+
+        else:
+            filename = os.path.join(os.environ['HOME'], '.ssh', 'id_rsa.pub')
 
     try:
         f = open(filename, 'rb')
@@ -101,7 +114,7 @@
         return []
     else:
         with f:
-            return [f.read().strip()]
+            return f.read().strip().splitlines()
 
 
 def create_default_user_data(fobj, args):
@@ -357,11 +370,6 @@
     domain.undefine()
 
 
-def get_lts_series():
-    output = subprocess.check_output(['distro-info', '--lts'], close_fds=True)
-    return output.strip()
-
-
 def main_create_get_user_data_fobj(args):
     """Return a user-data fobj to use, based on command line arguments
     supplied.
@@ -420,12 +428,15 @@
         return
 
     user_data_fobj = main_create_get_user_data_fobj(args)
+
+    (_mirror, filters) = uvtool.ubuntu.patch_filters(args.filters)
+
     if args.backing_image_file:
         abs_image_backing_file = os.path.abspath(args.backing_image_file)
     else:
         abs_image_backing_file = None
     create(
-        args.hostname, args.filters, user_data_fobj,
+        args.hostname, filters, user_data_fobj,
         backing_image_file=abs_image_backing_file,
         bridge=args.bridge,
         cpu=args.cpu,
@@ -564,7 +575,7 @@
     create_subparser.add_argument('hostname')
     create_subparser.add_argument(
         'filters', nargs='*', metavar='filter',
-        default=["release=%s" % get_lts_series()],
+        default=[uvtool.ubuntu.get_lts_series()],
     )
     destroy_subparser = subparsers.add_parser('destroy')
     destroy_subparser.set_defaults(func=main_destroy)

=== modified file 'bin/uvt-simplestreams-libvirt' (properties changed: -x to +x)
=== modified file 'uvtool/libvirt/simplestreams.py'
--- uvtool/libvirt/simplestreams.py	2013-11-26 14:25:59 +0000
+++ uvtool/libvirt/simplestreams.py	2013-12-13 14:30:46 +0000
@@ -35,6 +35,8 @@
 import subprocess
 import sys
 
+import distro_info
+
 import libvirt
 
 import simplestreams.filters
@@ -42,6 +44,7 @@
 import simplestreams.util
 
 import uvtool.libvirt
+import uvtool.ubuntu
 
 LIBVIRT_POOL_NAME = 'uvtool'
 IMAGE_DIR = '/var/lib/uvtool/libvirt/images/' # must end in '/'; see use
@@ -249,8 +252,10 @@
 
 
 def main_sync(args):
+    (mirror_url, filters) = uvtool.ubuntu.patch_filters(args.filters, args.mirror_url)
+
     (mirror_url, initial_path) = simplestreams.util.path_from_mirror_url(
-        args.mirror_url, args.path)
+        mirror_url, args.path)
 
     def policy(content, path):
         if initial_path.endswith('sjson') and not args.no_authentication:
@@ -263,7 +268,7 @@
         mirror_url, policy=policy)
 
     filter_list = simplestreams.filters.get_filters(
-        ['datatype=image-downloads', 'ftype=disk1.img'] + args.filters
+        ['datatype=image-downloads', 'ftype=disk1.img'] + filters
     )
     tmirror = LibvirtMirror(filter_list, verbose=args.verbose)
     tmirror.sync(smirror, initial_path)
@@ -306,10 +311,9 @@
     sync_subparser.add_argument(
         '--keyring',
         help='keyring to be specified to gpg via --keyring',
-        default='/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg'
+        default=uvtool.ubuntu.KEYRING,
     )
-    sync_subparser.add_argument('--source', dest='mirror_url',
-        default='https://cloud-images.ubuntu.com/releases/')
+    sync_subparser.add_argument('--source', dest='mirror_url', default=None)
     sync_subparser.add_argument('--no-authentication', action='store_true')
     sync_subparser.add_argument('filters', nargs='*', metavar='filter',
         default=["arch=%s" % system_arch])

=== added file 'uvtool/ubuntu.py'
--- uvtool/ubuntu.py	1970-01-01 00:00:00 +0000
+++ uvtool/ubuntu.py	2013-12-13 14:30:46 +0000
@@ -0,0 +1,61 @@
+# Copyright (C) 2012-3 Canonical Ltd.
+# Author: Robie Basak <[e-mail]>
+#
+# 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/>.
+
+# Depends: distro-info, cloud-utils, python-libvirt, python-lxml
+# also qemu-kvm (precise) or kvm (newer?)
+# The import subcommand needs: qemu-utils (for qemu-img)
+import distro_info
+
+STREAMS = {
+    'daily': 'https://cloud-images.ubuntu.com/releases/',
+    'released': 'https://cloud-images.ubuntu.com/daily/',
+}
+KEYRING = '/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg'
+
+
+def get_lts_series():
+    return(distro_info.UbuntuDistroInfo().lts())
+
+
+def get_devel_series():
+    return(distro_info.UbuntuDistroInfo().devel())
+
+
+def get_series_list():
+    return(distro_info.UbuntuDistroInfo().supported())
+
+
+def patch_filters(filters=None, mirror=None):
+    if filters is None:
+        filters = []
+
+    if mirror is None:
+        nmirror = STREAMS['released']
+    else:
+        nmirror = mirror
+
+    devel = get_devel_series()
+    slist = get_series_list()
+
+    nfilters = []
+    for f in filters:
+        if f in slist:
+            f = "release=%s" % f
+        if f == devel and mirror is None:
+            nmirror = STREAMS['daily']
+        nfilters.append(f)
+
+    return (nmirror, nfilters)