From 4769c5cf1b52c8090026c87cb79f4bfb074bbba2 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Fri, 20 Jul 2018 13:40:49 +0300
Subject: [PATCH] volume filename extension converted to choosable with
 settings. And file extensions reorganized.

---
 vrtManager/connection.py | 4 ++++
 vrtManager/create.py     | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/vrtManager/connection.py b/vrtManager/connection.py
index 9694b02..2c4f6f2 100644
--- a/vrtManager/connection.py
+++ b/vrtManager/connection.py
@@ -399,6 +399,10 @@ class wvmConnect(object):
         """Get available image formats"""
         return [ 'raw', 'qcow', 'qcow2' ]
 
+    def get_file_extensions(self):
+        """Get available image filename extensions"""
+        return [ 'img', 'qcow', 'qcow2' ]
+
     def get_iface(self, name):
         return self.wvm.interfaceLookupByName(name)
 
diff --git a/vrtManager/create.py b/vrtManager/create.py
index 27971bd..00f2d68 100644
--- a/vrtManager/create.py
+++ b/vrtManager/create.py
@@ -2,6 +2,8 @@ import string
 from vrtManager import util
 from vrtManager.connection import wvmConnect
 from webvirtcloud.settings import QEMU_CONSOLE_DEFAULT_TYPE
+from webvirtcloud.settings import INSTANCE_VOLUME_DEFAULT_FILE_EXTENSION
+from webvirtcloud.settings import INSTANCE_VOLUME_DEFAULT_FORMAT
 
 
 def get_rbd_storage_data(stg):
@@ -21,6 +23,9 @@ def get_rbd_storage_data(stg):
 
 
 class wvmCreate(wvmConnect):
+    image_extension = INSTANCE_VOLUME_DEFAULT_FILE_EXTENSION
+    image_format = INSTANCE_VOLUME_DEFAULT_FORMAT
+
     def get_storages_images(self):
         """
         Function return all images on all storages
@@ -30,7 +35,7 @@ class wvmCreate(wvmConnect):
         for storage in storages:
             stg = self.get_storage(storage)
             if not stg.isActive():
-                pass
+                continue
             try:
                 stg.refresh(0)
             except:
@@ -50,7 +55,7 @@ class wvmCreate(wvmConnect):
         """Get guest capabilities"""
         return util.get_xml_path(self.get_cap_xml(), "/capabilities/host/cpu/arch")
 
-    def create_volume(self, storage, name, size, format='qcow2', metadata=False, image_extension='img'):
+    def create_volume(self, storage, name, size, format=image_format, metadata=False, image_extension=image_extension):
         size = int(size) * 1073741824
         stg = self.get_storage(storage)
         storage_type = util.get_xml_path(stg.XMLDesc(0), "/pool/@type")