openstack/horizon
Code Issues Proposed changes

Merge "add ploop type to the list of image backends"

Browse Source
This commit is contained in:
Jenkins 2016-10-13 06:11:47 +00:00 committed by Gerrit Code Review
commit 4c3798a996
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openstack_dashboard/settings.py
View File

@ -92,6 +92,7 @@ OPENSTACK_IMAGE_BACKEND = {
('docker', _('Docker')),
('iso', _('ISO - Optical Disk Image')),
('ova', _('OVA - Open Virtual Appliance')),
('ploop', _('PLOOP - Virtuozzo/Parallels Loopback Disk')),
('qcow2', _('QCOW2 - QEMU Emulator')),
('raw', _('Raw')),
('vdi', _('VDI - Virtual Disk Image')),

2
openstack_dashboard/static/app/core/images/images.module.js
View File

@ -171,6 +171,7 @@
{label: gettext('Docker'), key: 'docker'},
{label: gettext('ISO'), key: 'iso'},
{label: gettext('OVA'), key: 'ova'},
{label: gettext('PLOOP'), key: 'ploop'},
{label: gettext('QCOW2'), key: 'qcow2'},
{label: gettext('Raw'), key: 'raw'},
{label: gettext('VDI'), key: 'vdi'},
@ -213,6 +214,7 @@
return {
iso: gettext('ISO - Optical Disk Image'),
ova: gettext('OVA - Open Virtual Appliance'),
ploop: gettext('PLOOP - Virtuozzo/Parallels Loopback Disk'),
qcow2: gettext('QCOW2 - QEMU Emulator'),
raw: gettext('Raw'),
vdi: gettext('VDI - Virtual Disk Image'),

2
openstack_dashboard/static/app/core/images/images.module.spec.js
View File

@ -67,7 +67,7 @@
}));
it('should be defined', function() {
expect(Object.keys(imageFormats).length).toEqual(11);
expect(Object.keys(imageFormats).length).toEqual(12);
});
});
})();

1
openstack_dashboard/test/settings.py
View File

@ -194,6 +194,7 @@ OPENSTACK_IMAGE_BACKEND = {
('ami', 'AMI - Amazon Machine Image'),
('ari', 'ARI - Amazon Ramdisk Image'),
('iso', 'ISO - Optical Disk Image'),
('ploop', 'PLOOP - Virtuozzo/Parallels Loopback Disk'),
('qcow2', 'QCOW2 - QEMU Emulator'),
('raw', 'Raw'),
('vdi', 'VDI'),