From: Lucian Petrut <lpetrut@cloudbasesolutions.com>
Date: Fri, 27 Mar 2015 12:15:25 +0000 (+0200)
Subject: Windows SMBFS: fix volume extend
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2727e8865ce7b9ef4eec81f7f07b7a0726eb304b;p=openstack-build%2Fcinder-build.git

Windows SMBFS: fix volume extend

The Windows SMBFS driver inherits the Linux SMBFS driver,
overriding Windows specific methods.

This commit Ic89cffc93940b7b119cfcde3362f304c9f2875df added the
volume name as an extra argument to the _do_extend_volume in order
to check if differencing images are pointing to backing files other
than the according volume disks.

Although this is not required on Windows, this method should accept
this extra argument in order to have the same signature as the
method it overrides. At the moment, this raises the following
exception:

TypeError: _do_extend_volume() takes exactly 3 arguments (4 given)

Closes-Bug: #1437290
(cherry picked from commit dca29e9ab3cdde210d3777e7c6b4a6849447058a)
Change-Id: I868d7de4a2c68f3fc520ba476a5660a84f440bb1
---

diff --git a/cinder/volume/drivers/windows/smbfs.py b/cinder/volume/drivers/windows/smbfs.py
index 8ec9688ca..533265ed5 100644
--- a/cinder/volume/drivers/windows/smbfs.py
+++ b/cinder/volume/drivers/windows/smbfs.py
@@ -164,7 +164,7 @@ class WindowsSmbfsDriver(smbfs.SmbfsDriver):
         self.vhdutils.create_differencing_vhd(new_snap_path,
                                               backing_file_full_path)
 
-    def _do_extend_volume(self, volume_path, size_gb):
+    def _do_extend_volume(self, volume_path, size_gb, volume_name=None):
         self.vhdutils.resize_vhd(volume_path, size_gb * units.Gi)
 
     @utils.synchronized('smbfs', external=False)