Comment 1 for bug 2021746

Revision history for this message
Michael Arndt (arndt-ntap) wrote :

Proposed diff of the simple changes to make this calculation consistent:

modules/controller/files/cinder/volume/drivers/netapp/dataontap/nfs_cmode.py
diff --git a/modules/controller/files/cinder/volume/drivers/netapp/dataontap/nfs_cmode.py b/modules/controller/files/cinder/volume/drivers/netapp/dataontap/nfs_cmode.py
index fc40f3a..edef16e 100644
--- a/modules/controller/files/cinder/volume/drivers/netapp/dataontap/nfs_cmode.py
+++ b/modules/controller/files/cinder/volume/drivers/netapp/dataontap/nfs_cmode.py
@@ -290,7 +290,8 @@ class NetAppCmodeNfsDriver(nfs_base.NetAppNfsDriver,
                 files = self.zapi_client.get_file_sizes_by_dir(ssc_vol_name)
                 provisioned_cap = 0
                 for f in files:
- if volume_utils.extract_id_from_volume_name(f['name']):
+ if volume_utils.extract_id_from_volume_name(f['name']) or \
+ volume_utils.extract_id_from_snapshot_name(f['name']):
                         provisioned_cap = provisioned_cap + f['file-size']
                 pool['provisioned_capacity_gb'] = na_utils.round_down(
                     float(provisioned_cap) / units.Gi)