| kparal | |
| tflink |
| libtaskotron |
Instead of just using an image from a pre-defined url, the base image is
looked for in imagesdir, and the latest image of the right type is
selected.
imageurl can be used to override the image discovery, if force_imageurl
is set to True (False by default).
Before we actually can specify the required image's release/flavor/arch
in formula, temporary config options were added.
.
unittests work, yet to be tested locally
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| conf/taskotron.yaml.example | ||
|---|---|---|
| 121–131 | The config file and config_defaults should be kept in sync, can you please put the default URL here as well? | |
| 134–136 | I'd probably call this minion_* to keep it consistent with minion_repos and other parts. Or we could rename minion_repos to disposable_repos. I just don't want this to be confusingly different. | |
| libtaskotron/ext/disposable/vm.py | ||
| 73 | There seems to be a typo. Is it covered by unit tests? :-) | |
| 74–75 | It seems a bit off to raise TaskotronRemoteError in this case (we still have no remote machine we would talk to, this code is about images), what about raising the original TaskotronImageNotFoundError? A few lines below, we could also raise TaskotronImageError instead TaskotronRemoteError, and document TaskotronImageError in the method docstring. Then it starts to make more sense. | |
| 251 | It seems that the usual suffix for raw images is .img, not .raw. | |
| conf/taskotron.yaml.example | ||
|---|---|---|
| 134–136 | Discussed in person - there is a difference in what these do - minion_repos are used on all minions, disposable_* is for disposable minions in particular. We probably should go through the config file as a whole, and decide on renaming some of the options, before too many people start caring. | |
| Path | Packages | |||
|---|---|---|---|---|
| M | conf/taskotron.yaml.example (13 lines) | |||
| M | libtaskotron/config_defaults.py (4 lines) | |||
| M | libtaskotron/ext/disposable/vm.py (46 lines) | |||
| M | testing/test_vm.py (43 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| c2fe85c8221e | d5b40fbc998e | f021db57df3a | Josef Skladanka | typo | Feb 19 2016, 11:27 AM |
| f021db57df3a | 8d8c2ded0de9 | 8281b5b54684 | Josef Skladanka | typo | Feb 19 2016, 11:25 AM |
| 8281b5b54684 | 399d0c27558d | 99cc9a12b1ed | Josef Skladanka | fixed by review comments | Feb 19 2016, 11:23 AM |
| 99cc9a12b1ed | 94fa4aadb23c | fb4cfd357835 | Josef Skladanka | Find base image for disposable client in a directory (Show More…) | Feb 16 2016, 12:52 PM |
| fb4cfd357835 | 1ce06257a56f | 0522bba4c730 | Josef Skladanka | Find base image for disposable client in a directory (Show More…) | Feb 16 2016, 12:12 PM |
| Show First 20 Lines • Show All 112 Lines • ▼ Show 20 Line(s) | |||||
| 113 | #artifactsdir: /var/lib/taskotron/artifacts | 113 | #artifactsdir: /var/lib/taskotron/artifacts | ||
| 114 | 114 | | |||
| 115 | ## The location of cached files downloaded by Taskotron | 115 | ## The location of cached files downloaded by Taskotron | ||
| 116 | #cachedir: /var/cache/taskotron | 116 | #cachedir: /var/cache/taskotron | ||
| 117 | 117 | | |||
| 118 | ## The location of images for disposable clients | 118 | ## The location of images for disposable clients | ||
| 119 | #imagesdir: /var/lib/taskotron/images | 119 | #imagesdir: /var/lib/taskotron/images | ||
| 120 | 120 | | |||
| 121 | ## Temporary option to specify url of an image to download and use for disposable client | 121 | ## If set to True, image from imageurl will be used instead of the latest image from imagesdir | ||
| 122 | #imageurl: | 122 | ## [default: False] | ||
| 123 | #force_imageurl: False | ||||
| 124 | | ||||
| 125 | ## Url of an image to download and use for disposable client, if force_imageurl was set | ||||
| 126 | #imageurl: http://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/x86_64/Images/Fedora-Cloud-Base-23-20151030.x86_64.qcow2 | ||||
| 127 | | ||||
| 128 | ## Temporary options to define release/flavor/arch for the disposable images discovery | ||||
| 129 | #disposable_release: 23 | ||||
| 130 | #disposable_flavor: taskotron_cloud | ||||
| 131 | #disposable_arch: x86_64 | ||||
| 123 | 132 | | |||
| 124 | ## Additional repos for minion to install packages from | 133 | ## Additional repos for minion to install packages from | ||
| 125 | #minion_repos: | 134 | #minion_repos: | ||
| 126 | # - https://copr.fedorainfracloud.org/coprs/tflink/taskotron/repo/fedora-23/tflink-taskotron-fedora-23.repo | 135 | # - https://copr.fedorainfracloud.org/coprs/tflink/taskotron/repo/fedora-23/tflink-taskotron-fedora-23.repo | ||
| 127 | 136 | | |||
Discussed in person - there is a difference in what these do - minion_repos are used on all minions, disposable_* is for disposable minions in particular. We probably should go through the config file as a whole, and decide on renaming some of the options, before too many people start caring. | |||||
| 128 | 137 | | |||
| 129 | ## ==== LOGGING section ==== | 138 | ## ==== LOGGING section ==== | ||
| 130 | ## This section contains configuration of logging. | 139 | ## This section contains configuration of logging. | ||
| 131 | 140 | | |||
| 132 | ## Configuration of logging level. Here can be configured which messages | 141 | ## Configuration of logging level. Here can be configured which messages | ||
| 133 | ## will be logged. You can specify different level for logging to standard | 142 | ## will be logged. You can specify different level for logging to standard | ||
| 134 | ## output (option log_level_stream) and logging to file (log_level_file). | 143 | ## output (option log_level_stream) and logging to file (log_level_file). | ||
| 135 | ## Possible values can be found here: | 144 | ## Possible values can be found here: | ||
| Show All 19 Lines | |||||
| Show First 20 Lines • Show All 73 Lines • ▼ Show 20 Line(s) | 31 | class Config(object): | |||
|---|---|---|---|---|---|
| 74 | logdir = '/var/log/taskotron' #: | 74 | logdir = '/var/log/taskotron' #: | ||
| 75 | client_taskdir = '/var/tmp/taskotron/taskdir' #: | 75 | client_taskdir = '/var/tmp/taskotron/taskdir' #: | ||
| 76 | artifactsdir = '/var/lib/taskotron/artifacts' #: | 76 | artifactsdir = '/var/lib/taskotron/artifacts' #: | ||
| 77 | cachedir = '/var/cache/taskotron' #: | 77 | cachedir = '/var/cache/taskotron' #: | ||
| 78 | imagesdir = '/var/lib/taskotron/images' #: | 78 | imagesdir = '/var/lib/taskotron/images' #: | ||
| 79 | imageurl = 'http://download.fedoraproject.org/pub/fedora/linux/'\ | 79 | imageurl = 'http://download.fedoraproject.org/pub/fedora/linux/'\ | ||
| 80 | 'releases/23/Cloud/x86_64/Images/Fedora-Cloud-'\ | 80 | 'releases/23/Cloud/x86_64/Images/Fedora-Cloud-'\ | ||
| 81 | 'Base-23-20151030.x86_64.qcow2' #: | 81 | 'Base-23-20151030.x86_64.qcow2' #: | ||
| 82 | force_imageurl = False #: | ||||
| 83 | disposable_release = '23' #: | ||||
| 84 | disposable_flavor = 'taskotron_cloud' #: | ||||
| 85 | disposable_arch = 'x86_64' #: | ||||
| 82 | 86 | | |||
| 83 | minion_repos = [ | 87 | minion_repos = [ | ||
| 84 | 'https://copr.fedorainfracloud.org/coprs/tflink/taskotron/repo/fedora-23/' | 88 | 'https://copr.fedorainfracloud.org/coprs/tflink/taskotron/repo/fedora-23/' | ||
| 85 | 'tflink-taskotron-fedora-23.repo'] #: | 89 | 'tflink-taskotron-fedora-23.repo'] #: | ||
| 86 | 90 | | |||
| 87 | log_level_stream = 'INFO' #: | 91 | log_level_stream = 'INFO' #: | ||
| 88 | log_level_file = 'DEBUG' #: | 92 | log_level_file = 'DEBUG' #: | ||
| 89 | 93 | | |||
| ▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines | |||||
| Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Line(s) | 28 | def __init__(self, uuid): | |||
|---|---|---|---|---|---|
| 47 | #: uuid of the task which spawned this instance | 47 | #: uuid of the task which spawned this instance | ||
| 48 | self.uuid = uuid | 48 | self.uuid = uuid | ||
| 49 | 49 | | |||
| 50 | #: hostname to use for spawned instance - based on username of current user | 50 | #: hostname to use for spawned instance - based on username of current user | ||
| 51 | self.hostname = 'taskotron-%s' % getpass.getuser() | 51 | self.hostname = 'taskotron-%s' % getpass.getuser() | ||
| 52 | 52 | | |||
| 53 | def _prepare_image(self): | 53 | def _prepare_image(self): | ||
| 54 | '''Use testcloud to prepare an image for local booting | 54 | '''Use testcloud to prepare an image for local booting | ||
| 55 | :raises TaskotronRemoteError: for errors in preparing the image with testcloud''' | 55 | :raises TaskotronImageNotFoundError: when base image of the required type is not found | ||
| 56 | :raises TaskotronImageError: for errors in preparing the image with testcloud | ||||
| 57 | ''' | ||||
| 56 | 58 | | |||
| 57 | log.debug("preparing image {} for task {}".format(self.imageurl, self.uuid)) | 59 | log.debug("preparing image {} for task {}".format(self.imageurl, self.uuid)) | ||
| 58 | tc_image = None | 60 | tc_image = None | ||
| 59 | 61 | | |||
| 60 | try: | 62 | try: | ||
| 61 | tc_image = image.Image(self.imageurl) | 63 | if config.get_config().force_imageurl: | ||
| 64 | img_url = config.get_config().imageurl | ||||
| 65 | else: | ||||
| 66 | # FIXME: release/flavor/arch should be provided from formula (?) | ||||
| 67 | img_url = ImageFinder.get_latest( | ||||
| 68 | release=config.get_config().disposable_release, | ||||
| 69 | flavor=config.get_config().disposable_flavor, | ||||
| 70 | arch=config.get_config().disposable_arch | ||||
| 71 | ) | ||||
| 72 | except exc.TaskotronImageNotFoundError, e: | ||||
| 73 | log.error(e) | ||||
| 74 | raise | ||||
| 75 | | ||||
It seems a bit off to raise TaskotronRemoteError in this case (we still have no remote machine we would talk to, this code is about images), what about raising the original TaskotronImageNotFoundError? A few lines below, we could also raise TaskotronImageError instead TaskotronRemoteError, and document TaskotronImageError in the method docstring. Then it starts to make more sense. | |||||
| 76 | try: | ||||
| 77 | tc_image = image.Image(img_url) | ||||
| 62 | tc_image.prepare() | 78 | tc_image.prepare() | ||
| 63 | except TestcloudImageError, e: | 79 | except TestcloudImageError, e: | ||
| 64 | log.error(e) | 80 | log.error(e) | ||
| 65 | raise exc.TaskotronRemoteError("There was an error while preparing the " | 81 | raise exc.TaskotronImageError("There was an error while preparing the " | ||
| 66 | "testcloud image", e) | 82 | "testcloud image", e) | ||
| 67 | 83 | | |||
| 68 | return tc_image | 84 | return tc_image | ||
| 69 | 85 | | |||
| 70 | def _prepare_instance(self, tc_image): | 86 | def _prepare_instance(self, tc_image): | ||
| 71 | '''Prepare an instance for booting and boot it with testcloud''' | 87 | '''Prepare an instance for booting and boot it with testcloud''' | ||
| 72 | log.debug("preparing testcloud instance {}".format(self.instancename)) | 88 | log.debug("preparing testcloud instance {}".format(self.instancename)) | ||
| 73 | tc_instance = instance.Instance(self.instancename, tc_image, hostname=self.hostname) | 89 | tc_instance = instance.Instance(self.instancename, tc_image, hostname=self.hostname) | ||
| ▲ Show 20 Lines • Show All 100 Lines • ▼ Show 20 Line(s) | 179 | def teardown(self): | |||
| 174 | 190 | | |||
| 175 | # wait for testcloud to actually stop the instance, currently | 191 | # wait for testcloud to actually stop the instance, currently | ||
| 176 | # instance.stop() returns before the instance is actually stopped | 192 | # instance.stop() returns before the instance is actually stopped | ||
| 177 | sleep(2) | 193 | sleep(2) | ||
| 178 | 194 | | |||
| 179 | self._destroy_instance(tc_instance) | 195 | self._destroy_instance(tc_instance) | ||
| 180 | 196 | | |||
| 181 | 197 | | |||
| 182 | class Image(object): | 198 | class ImageFinder(object): | ||
| 183 | '''Retrieve images from either local or remote sources''' | 199 | '''Retrieve images from either local or remote sources''' | ||
| 184 | 200 | | |||
| 185 | @classmethod | 201 | @classmethod | ||
| 186 | def get_all_filenames(cls, imagesdir=None): | 202 | def get_all_filenames(cls, imagesdir=None): | ||
| 187 | """Get list of images present on the system. | 203 | """Get list of images present on the system. | ||
| 188 | 204 | | |||
| 189 | :param imagesdir: absolute path to directory containing the images, path from config is | 205 | :param imagesdir: absolute path to directory containing the images, path from config is | ||
| 190 | used if None | 206 | used if None | ||
| Show All 9 Lines | 215 | def get_latest(cls, release, flavor, arch='x86_64', imagesdir=None): | |||
| 200 | """Search for the most recent image available on the system. | 216 | """Search for the most recent image available on the system. | ||
| 201 | 217 | | |||
| 202 | :param release: release of the image (e.g. ``23``) | 218 | :param release: release of the image (e.g. ``23``) | ||
| 203 | :param flavor: flavor of the image (e.g. ``minimal``) | 219 | :param flavor: flavor of the image (e.g. ``minimal``) | ||
| 204 | :param imagesdir: absolute path to directory containing the images, path from config is | 220 | :param imagesdir: absolute path to directory containing the images, path from config is | ||
| 205 | used if None | 221 | used if None | ||
| 206 | :param arch: architecture of the image | 222 | :param arch: architecture of the image | ||
| 207 | 223 | | |||
| 208 | :return: testcloud.image.Image instance | 224 | :return: file:// url of the latest image available | ||
| 209 | :raises TaskotronImageError: if no such image for given release and flavor was found | 225 | :raises TaskotronImageError: if no such image for given release and flavor was found | ||
| 210 | """ | 226 | """ | ||
| 211 | 227 | | |||
| 212 | latest_metadata = cls.get_latest_metadata(release, flavor, arch, imagesdir) | 228 | latest_metadata = cls.get_latest_metadata(release, flavor, arch, imagesdir) | ||
| 213 | 229 | | |||
| 214 | if not latest_metadata: | 230 | if not latest_metadata: | ||
| 215 | raise exc.TaskotronImageNotFoundError('No such image for release %s and flavor %s.' % | 231 | raise exc.TaskotronImageNotFoundError('No image for release %s, flavor %s, arch %s.' % | ||
| 216 | (release, flavor)) | 232 | (release, flavor, arch)) | ||
| 217 | else: | 233 | else: | ||
| 218 | return image.Image("file://" + os.path.join(imagesdir, latest_metadata['filename'])) | 234 | return "file://" + os.path.join(imagesdir, latest_metadata['filename']) | ||
| 219 | 235 | | |||
| 220 | @classmethod | 236 | @classmethod | ||
| 221 | def get_latest_metadata(cls, release, flavor, arch='x86_64', imagesdir=None): | 237 | def get_latest_metadata(cls, release, flavor, arch='x86_64', imagesdir=None): | ||
| 222 | """Search for the most recent image available on the system. | 238 | """Search for the most recent image available on the system. | ||
| 223 | 239 | | |||
| 224 | :param release: release of the image (e.g. ``23``) | 240 | :param release: release of the image (e.g. ``23``) | ||
| 225 | :param flavor: flavor of the image (e.g. ``minimal``) | 241 | :param flavor: flavor of the image (e.g. ``minimal``) | ||
| 226 | :param imagesdir: absolute path to directory containing the images, path from config is | 242 | :param imagesdir: absolute path to directory containing the images, path from config is | ||
| 227 | used if None | 243 | used if None | ||
| 228 | :param arch: arch of the image (e.g. 'x86_64') | 244 | :param arch: arch of the image (e.g. 'x86_64') | ||
| 229 | 245 | | |||
| 230 | :return: metadata of the most recent image | 246 | :return: metadata of the most recent image | ||
| 231 | :rtype: dict {'date': str, 'version': str, 'release': str, 'arch': str, 'filename': str} | 247 | :rtype: dict {'date': str, 'version': str, 'release': str, 'arch': str, 'filename': str} | ||
| 232 | """ | 248 | """ | ||
| 233 | 249 | | |||
| 234 | pattern = re.compile(r'^([0-9]{8})_([0-9]{4})-fedora-(.*?)-(.*?)-(.*?)\.qcow2$') | 250 | release = str(release) | ||
| 251 | pattern = re.compile(r'^([0-9]{6}_[0-9]{4})-fedora-(.*?)-(.*?)-(.*?)\.(qcow2|raw|img)$') | ||||
| 235 | 252 | | |||
| 236 | images = [] | 253 | images = [] | ||
| 237 | for filename in cls.get_all_filenames(imagesdir): | 254 | for filename in cls.get_all_filenames(imagesdir): | ||
| 238 | m = pattern.match(filename) | 255 | m = pattern.match(filename) | ||
| 239 | if m: | 256 | if m: | ||
| 240 | images.append({'date': m.group(1), | 257 | images.append({'timestamp': m.group(1), | ||
| 241 | 'version': m.group(2), | 258 | 'release': m.group(2), | ||
| 242 | 'release': m.group(3), | 259 | 'flavor': m.group(3), | ||
| 243 | 'flavor': m.group(4), | 260 | 'arch': m.group(4), | ||
| 244 | 'arch': m.group(5), | | |||
| 245 | 'filename': filename}) | 261 | 'filename': filename}) | ||
| 246 | 262 | | |||
| 247 | filtered = [i for i in images if i['release'] == release and i['flavor'] == flavor and i['arch'] == arch] | 263 | filtered = [i for i in images if i['release'] == release and i['flavor'] == flavor and i['arch'] == arch] | ||
| 248 | if not filtered: | 264 | if not filtered: | ||
| 249 | return None | 265 | return None | ||
| 250 | else: | 266 | else: | ||
| 251 | return sorted(filtered, key=lambda i: int(i['date']+i['version']))[-1] | 267 | return sorted(filtered, key=lambda i: i['timestamp'])[-1] | ||
| Show All 18 Lines | 17 | class TestvmImagePrepare(object): | |||
|---|---|---|---|---|---|
| 19 | 19 | | |||
| 20 | def setup_method(self, method): | 20 | def setup_method(self, method): | ||
| 21 | self.ref_uuid = '1234-5678-9012' | 21 | self.ref_uuid = '1234-5678-9012' | ||
| 22 | 22 | | |||
| 23 | def should_raise_on_failure(self, monkeypatch): | 23 | def should_raise_on_failure(self, monkeypatch): | ||
| 24 | stub_image = Mock(side_effect=tce.TestcloudImageError()) | 24 | stub_image = Mock(side_effect=tce.TestcloudImageError()) | ||
| 25 | 25 | | |||
| 26 | monkeypatch.setattr(image, 'Image', stub_image) | 26 | monkeypatch.setattr(image, 'Image', stub_image) | ||
| 27 | monkeypatch.setattr(vm.ImageFinder, 'get_latest_metadata', Dingus()) | ||||
| 27 | 28 | | |||
| 28 | test_vm = vm.TestCloudMachine(self.ref_uuid) | 29 | test_vm = vm.TestCloudMachine(self.ref_uuid) | ||
| 29 | 30 | | |||
| 30 | with pytest.raises(exc.TaskotronRemoteError): | 31 | with pytest.raises(exc.TaskotronImageError): | ||
| 31 | test_vm._prepare_image() | 32 | test_vm._prepare_image() | ||
| 32 | 33 | | |||
| 33 | def should_behave_on_success(self, monkeypatch): | 34 | def should_behave_on_success(self, monkeypatch): | ||
| 34 | stub_image = MagicMock() | 35 | stub_image = MagicMock() | ||
| 35 | 36 | | |||
| 36 | monkeypatch.setattr(image, 'Image', stub_image) | 37 | monkeypatch.setattr(image, 'Image', stub_image) | ||
| 38 | monkeypatch.setattr(vm.ImageFinder, 'get_latest_metadata', Dingus()) | ||||
| 37 | 39 | | |||
| 38 | test_vm = vm.TestCloudMachine(self.ref_uuid) | 40 | test_vm = vm.TestCloudMachine(self.ref_uuid) | ||
| 39 | 41 | | |||
| 40 | test_vm._prepare_image() | 42 | test_vm._prepare_image() | ||
| 41 | 43 | | |||
| 42 | 44 | | |||
| 43 | class TestvmInstancePrepare(object): | 45 | class TestvmInstancePrepare(object): | ||
| 44 | '''Test libtaskotron.vm._prepare_instance''' | 46 | '''Test libtaskotron.vm._prepare_instance''' | ||
| ▲ Show 20 Lines • Show All 113 Lines • ▼ Show 20 Line(s) | 159 | with pytest.raises(exc.TaskotronRemoteError): | |||
| 158 | test_vm._check_existing_instance(False) | 160 | test_vm._check_existing_instance(False) | ||
| 159 | 161 | | |||
| 160 | 162 | | |||
| 161 | @pytest.mark.usefixtures("setup") | 163 | @pytest.mark.usefixtures("setup") | ||
| 162 | class TestImageLatest: | 164 | class TestImageLatest: | ||
| 163 | 165 | | |||
| 164 | @pytest.fixture | 166 | @pytest.fixture | ||
| 165 | def setup(self, monkeypatch): | 167 | def setup(self, monkeypatch): | ||
| 166 | self.images = ['20151008_0427-fedora-23-cloud-x86_64.qcow2', | 168 | self.images = ['151008_0427-fedora-23-cloud-x86_64.qcow2', | ||
| 167 | 'ubuntu-fabulous-fedora.qcow2', | 169 | 'ubuntu-fabulous-fedora.qcow2', | ||
| 168 | '20151008_0223-fedora-23-minimal-i386.qcow2', | 170 | '151008_0223-fedora-23-minimal-i386.qcow2', | ||
| 169 | '20151105_0100-server-x86_64.qcow2', | 171 | '151105_0100-server-x86_64.qcow2', | ||
| 170 | 'el_capitan.iso', | 172 | 'el_capitan.iso', | ||
| 171 | '20151008_0100-server.qcow2', | 173 | '151008_0100-server.qcow2', | ||
| 172 | '20151007_0516-fedora-23-minimal-x86_64.qcow2', | 174 | '151007_0516-fedora-23-minimal-x86_64.qcow2', | ||
| 173 | '20151007_0516-fedora-rawhide-minimal-x86_64.qcow2', | 175 | '151007_0516-fedora-rawhide-minimal-x86_64.qcow2', | ||
| 174 | 'windows10.raw', | 176 | 'windows10.raw', | ||
| 175 | '20151008_0315-fedora-23-minimal-i386.qcow2', | 177 | '151008_0315-fedora-23-minimal-i386.qcow2', | ||
| 176 | '20151008_0315-fedora-23-minimal-x86_64.qcow2'] | 178 | '151008_0315-fedora-23-minimal-x86_64.qcow2'] | ||
| 177 | self.stub_list_images = Dingus() | 179 | self.stub_list_images = Dingus() | ||
| 178 | monkeypatch.setattr(vm.Image, 'get_all_filenames', self.stub_list_images) | 180 | monkeypatch.setattr(vm.ImageFinder, 'get_all_filenames', self.stub_list_images) | ||
| 181 | | ||||
| 179 | 182 | | |||
| 180 | def test_dir_populated(self): | 183 | def test_dir_populated(self): | ||
| 181 | self.stub_list_images.return_value = self.images | 184 | self.stub_list_images.return_value = self.images | ||
| 182 | 185 | | |||
| 183 | assert vm.Image.get_latest_metadata('23', 'minimal', 'i386', '')['filename'] ==\ | 186 | assert vm.ImageFinder.get_latest_metadata('23', 'minimal', 'i386', '')['filename'] ==\ | ||
| 184 | '20151008_0315-fedora-23-minimal-i386.qcow2' | 187 | '151008_0315-fedora-23-minimal-i386.qcow2' | ||
| 185 | assert vm.Image.get_latest_metadata('23', 'minimal', 'x86_64', '')['filename'] ==\ | 188 | assert vm.ImageFinder.get_latest_metadata('23', 'minimal', 'x86_64', '')['filename'] ==\ | ||
| 186 | '20151008_0315-fedora-23-minimal-x86_64.qcow2' | 189 | '151008_0315-fedora-23-minimal-x86_64.qcow2' | ||
| 187 | 190 | | |||
| 188 | 191 | | |||
| 189 | def test_dir_populated_single(self): | 192 | def test_dir_populated_single(self): | ||
| 190 | self.stub_list_images.return_value = self.images | 193 | self.stub_list_images.return_value = self.images | ||
| 191 | 194 | | |||
| 192 | assert vm.Image.get_latest_metadata('23', 'cloud', 'x86_64', '')['filename'] ==\ | 195 | assert vm.ImageFinder.get_latest_metadata('23', 'cloud', 'x86_64', '')['filename'] ==\ | ||
| 193 | '20151008_0427-fedora-23-cloud-x86_64.qcow2' | 196 | '151008_0427-fedora-23-cloud-x86_64.qcow2' | ||
| 194 | assert vm.Image.get_latest_metadata('rawhide', 'minimal', 'x86_64', '')['filename'] ==\ | 197 | assert vm.ImageFinder.get_latest_metadata('rawhide', 'minimal', 'x86_64', '')['filename'] ==\ | ||
| 195 | '20151007_0516-fedora-rawhide-minimal-x86_64.qcow2' | 198 | '151007_0516-fedora-rawhide-minimal-x86_64.qcow2' | ||
| 196 | 199 | | |||
| 197 | def test_dir_empty(self): | 200 | def test_dir_empty(self): | ||
| 198 | self.stub_list_images.return_value = [] | 201 | self.stub_list_images.return_value = [] | ||
| 199 | 202 | | |||
| 200 | assert vm.Image.get_latest_metadata('23', 'minimal', '') is None | 203 | assert vm.ImageFinder.get_latest_metadata('23', 'minimal', '') is None | ||
| 201 | 204 | | |||
| 202 | def test_no_such_image(self): | 205 | def test_no_such_image(self): | ||
| 203 | self.stub_list_images.return_value = self.images | 206 | self.stub_list_images.return_value = self.images | ||
| 204 | 207 | | |||
| 205 | assert vm.Image.get_latest_metadata('69', 'ultimate', '') is None | 208 | assert vm.ImageFinder.get_latest_metadata('69', 'ultimate', '') is None | ||
The config file and config_defaults should be kept in sync, can you please put the default URL here as well?