Differential D528

find latest image using filename convention
AbandonedPublic
Actions

Authored by lbrabec on Aug 25 2015, 12:26 PM.

Details

Reviewers
kparal
roshi
tflink
jskladan
Maniphest Tasks
T575: find most recent images using filename convention
Summary

New function that searches /var/lib/testcloud/cache for the most
recent image using filename convention <date>-<release>-<template>.qcow2

Test Plan

new tests written
py.test test/

Diff Detail

Repository
rTCLOUD testcloud
Branch
feature/T575
Lint
Lint OK
Unit
Unit Tests OK
Build Status
Buildable 124
Build 124: arc lint + arc unit
lbrabec retitled this revision from to find latest image using filename convention.Aug 25 2015, 12:26 PM
lbrabec updated this object.
lbrabec edited the test plan for this revision. (Show Details)
lbrabec added reviewers: roshi, jskladan, kparal, tflink.
tflink requested changes to this revision.Aug 25 2015, 4:02 PM

When I wrote T575, i had intended the code to go into libtaskotron instead of testcloud because I don't think this naming scheme makes sense for testcloud - it's designed to grab the official cloud images, not stuff that we're generating for Taskotron.

Unless @roshi disagrees with me, please move this code to libtaskotron

testcloud/image.py
50

please use more descriptive variables - we're not being charged per character

63

not sure we want to be returning just the name here if the code stays in testcloud - behavior should be similar to find_image

This revision now requires changes to proceed.Aug 25 2015, 4:02 PM
kparal added a comment.Aug 26 2015, 8:22 AM

I agree this should go into libtaskotron. I think we should also store the images in our own directories, not in testcloud directories. Then we would just tell testcloud "please run this image: /path/to/image".

testcloud/image.py
48

I'd prefer a timestamp scheme which allows us to build several images in a single day - let's say when there's a security patch, or we just need to fix some bug. ISO8601? Or something shorter?

lbrabec abandoned this revision.Oct 12 2015, 8:02 AM

This is no longer valid, I will provide another diff.

Revision Contents

PathCoverage (All)Coverage (Touched)Packages
Mtest/test_image.py (41 lines)100%100%
Mtestcloud/image.py (26 lines)49%100%

Diff 1382

View Options

test/test_image.py

1#!/usr/bin/env python 1​#!/usr/bin/env python
2# -*- coding: utf-8 -*- 2​# -*- coding: utf-8 -*-
3# Copyright 2015, Red Hat, Inc. 3​# Copyright 2015, Red Hat, Inc.
4# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+> 4​# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
5# See the LICENSE file for more details on Licensing 5​# See the LICENSE file for more details on Licensing
6 6​
7""" This module is for testing the behaviour of the Image class.""" 7​""" This module is for testing the behaviour of the Image class."""
8 8​
9import pytest 9​import pytest
10​from dingus import Dingus
10 11​
11from testcloud import image 12​from testcloud import image
12from testcloud.exceptions import TestcloudImageError 13​from testcloud.exceptions import TestcloudImageError
13 14​
14 15​
15class TestImage: 16​class TestImage:
16 17​
17 def test_image_download_path(self): 18​ def test_image_download_path(self):
18 pass 19​ pass
19 20​
20 def test_image_name(self): 21​ def test_image_name(self):
21 pass 22​ pass
22 23​
23 def test_download(self): 24​ def test_download(self):
24 pass 25​ pass
25 26​
26# def test_save_pristine(self): 27​# def test_save_pristine(self):
27# pass 28​# pass
28# 29​#
29# def test_load_pristine(self): 30​# def test_load_pristine(self):
30# pass 31​# pass
31 32​
32 33​
34​@pytest.mark.usefixtures("setup")
35​class TestImageLatest:
36​
37​ @pytest.fixture
38​ def setup(self, monkeypatch):
39​ self.images = ['20150805-f23-cloud.qcow2',
40​ 'ubuntu-fabulous-fedora.qcow2',
41​ '20150824-f23-minimal.qcow2',
42​ '20150825-f23-server.qcow2',
43​ 'el_capitan.iso',
44​ '20150819-f23-server.qcow2',
45​ '20150825-f23-minimal.qcow2',
46​ 'windows10.raw',
47​ '20150826-f23-minimal.qcow2']
48​ self.stub_list_images = Dingus()
49​ monkeypatch.setattr(image, 'list_images', self.stub_list_images)
50​
51​ def test_dir_populated(self):
52​ self.stub_list_images.return_value = self.images
53​
54​ assert image.latest_image('f23', 'minimal') == '20150826-f23-minimal.qcow2'
55​
56​ def test_dir_populated_single(self):
57​ self.stub_list_images.return_value = self.images
58​
59​ assert image.latest_image('f23', 'cloud') == '20150805-f23-cloud.qcow2'
60​
61​ def test_dir_empty(self):
62​ self.stub_list_images.return_value = []
63​
64​ with pytest.raises(TestcloudImageError):
65​ image.latest_image('f23', 'minimal')
66​
67​ def test_no_such_image(self):
68​ self.stub_list_images.return_value = self.images
69​
70​ with pytest.raises(TestcloudImageError):
71​ image.latest_image('f69', 'ultimate')
72​
73​
33class TestImageUriProcess(object): 74​class TestImageUriProcess(object):
34 """The basic idea of what these tests do is to make sure that uris are 75​ """The basic idea of what these tests do is to make sure that uris are
35 parsed properly. http, https and file are OK and supported. ftp is an 76​ parsed properly. http, https and file are OK and supported. ftp is an
36 an example of a type which is not currently supported and should raise an 77​ an example of a type which is not currently supported and should raise an
37 exception.""" 78​ exception."""
38 79​
39 def setup_method(self, method): 80​ def setup_method(self, method):
40 self.image_name = 'image.img' 81​ self.image_name = 'image.img'
▲ Show 20 Lines • Show All 54 Lines • Show Last 20 Lines
View Options

testcloud/image.py

Show All 31 Lines28def list_images():
32 """ 32​ """
33 33​
34 image_dir = '{}/cache'.format(config_data.DATA_DIR) 34​ image_dir = '{}/cache'.format(config_data.DATA_DIR)
35 images = os.listdir(image_dir) 35​ images = os.listdir(image_dir)
36 36​
37 return images 37​ return images
38 38​
39 39​
40​def latest_image(release, template):
41​ """Search for the most recent image available on the system.
42​
43​ :param release: release of the image (e.g. 'f23')
44​ :param template: template of the image (e.g. 'minimal')
45​
46​ :returns: filename of the most recent image
47​ """
48​ pattern = re.compile(r'^(\d{8})-(.*?)-(.*?)\.qcow2$')
kparalUnsubmitted
Not Done

I'd prefer a timestamp scheme which allows us to build several images in a single day - let's say when there's a security patch, or we just need to fix some bug. ISO8601? Or something shorter?

49​ images = []
50​ for f in list_images():
tflinkUnsubmitted
Not Done

please use more descriptive variables - we're not being charged per character

51​ m = pattern.match(f)
52​ if m:
53​ images.append({'date': m.group(1),
54​ 'release': m.group(2),
55​ 'template': m.group(3),
56​ 'filename': f})
57​
58​ filtered = [i for i in images if i['release'] == release and i['template'] == template]
59​ if not filtered:
60​ raise TestcloudImageError('No such image for release %s and template %s.' %
61​ (release, template))
62​
63​ return sorted(filtered, key=lambda i: int(i['date']))[-1]['filename']
tflinkUnsubmitted
Not Done

not sure we want to be returning just the name here if the code stays in testcloud - behavior should be similar to find_image

64​
65​
40def find_image(name, uri=None): 66​def find_image(name, uri=None):
41 """Find an image matching a given name and optionally, a uri 67​ """Find an image matching a given name and optionally, a uri
42 68​
43 :param name: name of the image to look for 69​ :param name: name of the image to look for
44 :param uri: source uri to use if the image is found 70​ :param uri: source uri to use if the image is found
45 71​
46 :returns: :py:class:`Image` if an image is found, otherwise None 72​ :returns: :py:class:`Image` if an image is found, otherwise None
47 """ 73​ """
▲ Show 20 Lines • Show All 165 Lines • Show Last 20 Lines