From 142cfab720bc35695f3604548c46212062eb6517 Mon Sep 17 00:00:00 2001
From: Maxim Nestratov <mnestratov@virtuozzo.com>
Date: Mon, 11 Jul 2016 22:47:46 +0300
Subject: [PATCH] add ploop type to the list of image backends

Ploop is a disk loopback block device, which is used by OpenVZ/Virtuozzo
containers, described here: https://openvz.org/Ploop
This type of backend is supported since Virtuozzo support was added in
Kilo release. Implemented as a part of
https://blueprints.launchpad.net/nova/+spec/pcs-support
then pcs was renamed to virtuozzo
https://blueprints.launchpad.net/nova/+spec/rename-pcs-to-virtuozzo

Change-Id: Ica7852f8b5d45938b66ae7ef71b4713eb2dd2a3c
---
 openstack_dashboard/settings.py                                 | 1 +
 openstack_dashboard/static/app/core/images/images.module.js     | 2 ++
 .../static/app/core/images/images.module.spec.js                | 2 +-
 openstack_dashboard/test/settings.py                            | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
index 7a9c5a83b8..f903acb15c 100644
--- a/openstack_dashboard/settings.py
+++ b/openstack_dashboard/settings.py
@@ -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')),
diff --git a/openstack_dashboard/static/app/core/images/images.module.js b/openstack_dashboard/static/app/core/images/images.module.js
index e70829101f..7e95ab2a72 100644
--- a/openstack_dashboard/static/app/core/images/images.module.js
+++ b/openstack_dashboard/static/app/core/images/images.module.js
@@ -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'),
diff --git a/openstack_dashboard/static/app/core/images/images.module.spec.js b/openstack_dashboard/static/app/core/images/images.module.spec.js
index 1fde2123b5..35d4baf64f 100644
--- a/openstack_dashboard/static/app/core/images/images.module.spec.js
+++ b/openstack_dashboard/static/app/core/images/images.module.spec.js
@@ -67,7 +67,7 @@
     }));
 
     it('should be defined', function() {
-      expect(Object.keys(imageFormats).length).toEqual(11);
+      expect(Object.keys(imageFormats).length).toEqual(12);
     });
   });
 })();
diff --git a/openstack_dashboard/test/settings.py b/openstack_dashboard/test/settings.py
index 42db0d8407..d8196d063b 100644
--- a/openstack_dashboard/test/settings.py
+++ b/openstack_dashboard/test/settings.py
@@ -193,6 +193,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'),