summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucian Petrut <lpetrut@cloudbasesolutions.com>2015-03-27 14:15:25 +0200
committerMike Perez <thingee@gmail.com>2015-04-21 07:40:51 -0700
commit2727e8865ce7b9ef4eec81f7f07b7a0726eb304b (patch)
tree67472693679a5b33dc2267c3fbfe56fe64582d1e
parentae6c589c52557988e24b5ee8005d8f81564a6068 (diff)
downloadcinder-2727e8865ce7b9ef4eec81f7f07b7a0726eb304b.tar.gz
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
-rw-r--r--cinder/volume/drivers/windows/smbfs.py2
1 files changed, 1 insertions, 1 deletions
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)