Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

first step towards image refactoring #495

Merged
6 commits merged into from
Dec 4, 2015
Merged

first step towards image refactoring #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3abdf7e
replace conflicting classmethods
glyph Nov 30, 2015
54f3825
no longer takes 'cls' argument
glyph Nov 30, 2015
26822a0
lint
glyph Nov 30, 2015
3a17430
Merge branch 'py26-twisted' into image-refactor
glyph Nov 30, 2015
9f5ad76
first image moved into plain-vanilla Image class
glyph Nov 30, 2015
a619a69
lint
glyph Nov 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions mimic/model/rackspace_image_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from __future__ import absolute_import, division, unicode_literals
from characteristic import attributes, Attribute
from six import iteritems
from mimic.model.rackspace_images import (RackspaceWindowsImage, RackspaceArchImage,
from mimic.model.rackspace_images import (RackspaceWindowsImage,
RackspaceCentOSPVImage, RackspaceCentOSPVHMImage,
RackspaceCoreOSImage, RackspaceDebianImage,
RackspaceFedoraImage, RackspaceFreeBSDImage,
Expand All @@ -16,6 +16,8 @@
RackspaceOnMetalDebianImage, RackspaceOnMetalFedoraImage,
RackspaceOnMetalUbuntuImage)

from mimic.model.rackspace_images import create_rackspace_images


@attributes([Attribute("image_list", default_factory=list)])
class RackspaceImageStore(object):
Expand All @@ -27,7 +29,7 @@ def create_image_store(self, tenant_id):
"""
Generates the data for each image in each image class
"""
image_classes = [RackspaceWindowsImage, RackspaceArchImage, RackspaceCentOSPVImage,
image_classes = [RackspaceWindowsImage, RackspaceCentOSPVImage,
RackspaceCentOSPVHMImage, RackspaceCoreOSImage, RackspaceDebianImage,
RackspaceFedoraImage, RackspaceFreeBSDImage, RackspaceGentooImage,
RackspaceOpenSUSEImage, RackspaceRedHatPVImage, RackspaceRedHatPVHMImage,
Expand All @@ -49,6 +51,7 @@ def create_image_store(self, tenant_id):
if 'com.rackspace__1__ui_default_show' in image_spec:
image.set_is_default()
self.image_list.append(image)
self.image_list.extend(create_rackspace_images(tenant_id))
return self.image_list

def get_image_by_id(self, image_id):
Expand Down
Loading