openstack/murano-dashboard
Code Issues Proposed changes

Merge "Filter out the snapshot image type"

Browse Source
This commit is contained in:
Jenkins
2017-04-13 09:07:04 +00:00
committed by Gerrit Code Review
parent cb4ebb4b47 f9e18f725c
commit c7ac310af9
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
muranodashboard/dynamic_ui/fields.py
View File

@@ -115,6 +115,9 @@ def get_murano_images(request):
LOG.error("Error to request image list from glance ") LOG.error("Error to request image list from glance ")
exceptions.handle(request, _("Unable to retrieve public images.")) exceptions.handle(request, _("Unable to retrieve public images."))
murano_images = [] murano_images = []
# filter out the snapshot image type
images = filter(
lambda x: x.properties.get("image_type", '') != 'snapshot', images)
for image in images: for image in images:
murano_property = image.properties.get('murano_image_info') murano_property = image.properties.get('murano_image_info')
if murano_property: if murano_property:

7
muranodashboard/images/forms.py
View File

@@ -27,6 +27,9 @@ LOG = logging.getLogger(__name__)
def filter_murano_images(images, request=None): def filter_murano_images(images, request=None):
# filter out the snapshot image type
images = filter(
lambda x: x.properties.get("image_type", '') != 'snapshot', images)
marked_images = [] marked_images = []
for image in images: for image in images:
metadata = image.properties.get('murano_image_info') metadata = image.properties.get('murano_image_info')
@@ -92,6 +95,10 @@ class MarkImageForm(horizon_forms.SelfHandlingForm):
images = filter( images = filter(
lambda x: x.container_format not in ('aki', 'ari'), images) lambda x: x.container_format not in ('aki', 'ari'), images)
# filter out the snapshot image type
images = filter(
lambda x: x.properties.get("image_type", '') != 'snapshot', images)
self.fields['image'].choices = [(i.id, i.name) for i in images] self.fields['image'].choices = [(i.id, i.name) for i in images]
self.fields['existing_titles'].initial = \ self.fields['existing_titles'].initial = \
[image.title for image in filter_murano_images(images)] [image.title for image in filter_murano_images(images)]

9
muranodashboard/tests/unit/images/test_forms.py
View File

@@ -40,6 +40,15 @@ class TestImagesForms(testtools.TestCase):
images = [self.mock_img] images = [self.mock_img]
self.assertEqual(images, forms.filter_murano_images(images)) self.assertEqual(images, forms.filter_murano_images(images))
snapshot_meta = {'image_type': u'snapshot',
'murano_image_info': '{"title": "title",\
"type": "type"}'}
mock_snapshot_img = \
mock.MagicMock(id=14, properties=snapshot_meta)
images = [mock_snapshot_img]
self.assertEqual([],
forms.filter_murano_images(images, self.mock_request))
class TestMarkImageForm(testtools.TestCase): class TestMarkImageForm(testtools.TestCase):
def setUp(self): def setUp(self):