wvmStorage.create_volume, wvmCreate.create_volume image naming respects image/volume format (qcow,qcow2)

instances/views.py

@@ -476,7 +476,11 @@ def instance(request, compute_id, vname):
 
                 path = connCreate.create_volume(storage, name, size, format, meta_prealloc, default_owner)
                 conn.attach_disk(path, target, subdriver=format, cache=cache, targetbus=bus)
+<<<<<<< HEAD
                 msg = _('Attach new disk: ' + target)
+=======
+                msg = _('Attach new disk {} ({})'.format(name, format))
+>>>>>>> 13ce824... wvmStorage.create_volume, wvmCreate.create_volume image naming respects image/volume format (qcow,qcow2)
                 addlogmsg(request.user.username, instance.name, msg)
                 return HttpResponseRedirect(request.get_full_path() + '#disks')
 

vrtManager/create.py

@@ -58,7 +58,10 @@ class wvmCreate(wvmConnect):
         stg = self.get_storage(storage)
         storage_type = util.get_xml_path(stg.XMLDesc(0), "/pool/@type")
         if storage_type == 'dir':
-            name += '.img'
+            if image_format in ('qcow', 'qcow2'):
+                name += '.' + image_format
+            else:
+                name += '.img'
             alloc = 0
         else:
             alloc = size

vrtManager/storage.py

@@ -213,7 +213,10 @@ class wvmStorage(wvmConnect):
         if vol_fmt == 'unknown':
             vol_fmt = 'raw'
         if storage_type == 'dir':
-            name += '.img'
+            if vol_fmt in ('qcow', 'qcow2'):
+                name += '.' + vol_fmt
+            else:
+                name += '.img'
             alloc = 0
         xml = """
             <volume>