From: Sean McGinnis <sean_mcginnis@dell.com>
Date: Tue, 10 Mar 2015 16:20:25 +0000 (-0500)
Subject: Dell FC driver inheritance order causing failures
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5b7c123056b9f6b91b3a4cff776916e1ebdbfd99;p=openstack-build%2Fcinder-build.git

Dell FC driver inheritance order causing failures

After commit 610c672998c87e2bf2f919a4fdea86749c748a1f merged
the third party CI test runs for the Dell Storage Center fibre
channel driver started failing. This appeared to be a change
in get_volume_stats calls.

After isolating the cause of this problem it was identified
that the order of the inherited classes for the driver was
resulting in the wrong overridden get_volume_stats call to be
called.

This patch fixes this be just switching the order of the two
parent classes DellCommonDriver and FibreChannelDriver. Swapping
these two results in the correctly overridden call to be made
and CI tests to pass successfully.

Change-Id: I58ec1fde585179037aeca8d449e74d0333fb013d
Closes-Bug: 1430421
---

diff --git a/cinder/volume/drivers/dell/dell_storagecenter_fc.py b/cinder/volume/drivers/dell/dell_storagecenter_fc.py
index d85a0d259..25da6cb79 100644
--- a/cinder/volume/drivers/dell/dell_storagecenter_fc.py
+++ b/cinder/volume/drivers/dell/dell_storagecenter_fc.py
@@ -26,8 +26,8 @@ from cinder.zonemanager import utils as fczm_utils
 LOG = logging.getLogger(__name__)
 
 
-class DellStorageCenterFCDriver(driver.FibreChannelDriver,
-                                dell_storagecenter_common.DellCommonDriver):
+class DellStorageCenterFCDriver(dell_storagecenter_common.DellCommonDriver,
+                                driver.FibreChannelDriver):
 
     '''Implements commands for Dell EqualLogic SAN ISCSI management.