]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Fix solaris_execute in SolarisISCSIDriver.
authorScott Devoid <devoid@anl.gov>
Mon, 5 May 2014 21:44:44 +0000 (16:44 -0500)
committerThomas Goirand <thomas@goirand.fr>
Mon, 9 Jun 2014 14:08:51 +0000 (22:08 +0800)
A previous refactor [1] of SolarisISCSIDriver and SanDriver renamed
the `_execute` function to `san_execute`. However, SolarisISCSIDriver
still called the _execute function, which no longer exists in it's
parent classes.

This change calls san_execute instead of _execute in
super(SolarisISCSIDriver, san).

[1] https://review.openstack.org/#/c/38194/

Closes-Bug: #1318108
Change-Id: I4cafefdb3eef8f3c2c345907d7eabd4e8f88ef65
(cherry picked from commit a7f24f0a2395594ead7eb8a5cef894b257cd7e4f)

cinder/volume/drivers/san/solaris.py

index 9a513265eb54e4bce35036a4fc6e7e71e1477b9c..f291dc8c4c18e1325942a2b86ae46cafc91d8ba9 100644 (file)
@@ -64,8 +64,7 @@ class SolarisISCSIDriver(SanISCSIDriver):
     def solaris_execute(self, *cmd, **kwargs):
         new_cmd = ['pfexec']
         new_cmd.extend(cmd)
-        return super(SolarisISCSIDriver, self)._execute(*new_cmd,
-                                                        **kwargs)
+        return super(SolarisISCSIDriver, self).san_execute(*new_cmd, **kwargs)
 
     def _view_exists(self, luid):
         (out, _err) = self._execute('/usr/sbin/stmfadm',