From: Scott Devoid <devoid@anl.gov>
Date: Mon, 5 May 2014 21:44:44 +0000 (-0500)
Subject: Fix solaris_execute in SolarisISCSIDriver.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=39f5a29d00138cbe136790fdac8b276e85074341;p=openstack-build%2Fcinder-build.git

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
(cherry picked from commit a7f24f0a2395594ead7eb8a5cef894b257cd7e4f)
---

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',