From a7f24f0a2395594ead7eb8a5cef894b257cd7e4f Mon Sep 17 00:00:00 2001 From: Scott Devoid Date: Mon, 5 May 2014 16:44:44 -0500 Subject: [PATCH] Fix solaris_execute in SolarisISCSIDriver. 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 --- cinder/volume/drivers/san/solaris.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cinder/volume/drivers/san/solaris.py b/cinder/volume/drivers/san/solaris.py index 9a513265e..f291dc8c4 100644 --- a/cinder/volume/drivers/san/solaris.py +++ b/cinder/volume/drivers/san/solaris.py @@ -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', -- 2.45.2