NetApp fix for compression and dedup stats

This change fixes the incorrect stats reported for compression and deduplication by NetApp iscsi and nfs backend. Change-Id: I3e97d953b3ea2231c3eb1f950b0ca6705b3b2286 Closes-Bug:#1236839 (cherry picked from commit 592d860)
openstack · Oct 21, 2013 · 9f8a709 · 9f8a709
1 parent eedc8ed
commit 9f8a709
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cinder/volume/drivers/netapp/iscsi.py b/cinder/volume/drivers/netapp/iscsi.py
@@ -1067,7 +1067,7 @@ def _update_cluster_vol_stats(self, data):
                 if len(self.ssc_vols['all']) > len(self.ssc_vols['dedup'])\
                 else 'false'
             data['netapp_compression'] = 'true'\
-                if self.ssc_vols['compression'] else False
+                if self.ssc_vols['compression'] else 'false'
             data['netapp_nocompression'] = 'true'\
                 if len(self.ssc_vols['all']) >\
                 len(self.ssc_vols['compression'])\

diff --git a/cinder/volume/drivers/netapp/nfs.py b/cinder/volume/drivers/netapp/nfs.py
@@ -893,7 +893,7 @@ def _update_cluster_vol_stats(self, data):
                 if len(self.ssc_vols['all']) >\
                 len(self.ssc_vols['dedup']) else 'false'
             data['netapp_compression'] = 'true'\
-                if self.ssc_vols['compression'] else False
+                if self.ssc_vols['compression'] else 'false'
             data['netapp_nocompression'] = 'true'\
                 if len(self.ssc_vols['all']) >\
                 len(self.ssc_vols['compression']) else 'false'

diff --git a/cinder/volume/drivers/netapp/ssc_utils.py b/cinder/volume/drivers/netapp/ssc_utils.py
@@ -293,7 +293,7 @@ def get_sis_vol_dict(na_server, vserver, volume=None):
                 path = sis.get_child_content('path')
                 if not path:
                     continue
-                (vol, __, ___) = path.rpartition('/')
+                (___, __, vol) = path.rpartition('/')
                 if not vol:
                     continue
                 v_sis = {}