From: Philipp Marek <philipp.marek@linbit.com>
Date: Mon, 8 Feb 2016 10:39:06 +0000 (+0100)
Subject: DRBD: Fix arguments for resize_volume DBus API call.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5be3200bc8c9cb617b1c59613bacddc1fda3d20f;p=openstack-build%2Fcinder-build.git

DRBD: Fix arguments for resize_volume DBus API call.

Change-Id: I754cd809ca7f7d3cc36e3a66b78e592053be1cee
---

diff --git a/cinder/tests/unit/test_drbdmanagedrv.py b/cinder/tests/unit/test_drbdmanagedrv.py
index 05acabc68..3ad639995 100644
--- a/cinder/tests/unit/test_drbdmanagedrv.py
+++ b/cinder/tests/unit/test_drbdmanagedrv.py
@@ -382,7 +382,7 @@ class DrbdManageIscsiTestCase(test.TestCase):
         self.assertEqual("res", dmd.odm.calls[1][1])
         self.assertEqual(2, dmd.odm.calls[1][2])
         self.assertEqual(-1, dmd.odm.calls[1][3])
-        self.assertEqual(5242880, dmd.odm.calls[1][4]['size'])
+        self.assertEqual(5242880, dmd.odm.calls[1][4])
 
     def test_create_cloned_volume(self):
         srcvol = {'project_id': 'testprjid',
diff --git a/cinder/volume/drivers/drbdmanagedrv.py b/cinder/volume/drivers/drbdmanagedrv.py
index a385e01aa..1ba6985b3 100644
--- a/cinder/volume/drivers/drbdmanagedrv.py
+++ b/cinder/volume/drivers/drbdmanagedrv.py
@@ -537,7 +537,7 @@ class DrbdManageBaseDriver(driver.VolumeDriver):
 
         res = self.call_or_reconnect(self.odm.resize_volume,
                                      d_res_name, d_vol_nr, -1,
-                                     {"size": self._vol_size_to_dm(new_size)},
+                                     self._vol_size_to_dm(new_size),
                                      0)
         self._check_result(res)
         return 0