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)
Proposed diff of the simple changes to make this calculation consistent:
modules/ controller/ files/cinder/ volume/ drivers/ netapp/ dataontap/ nfs_cmode. py controller/ files/cinder/ volume/ drivers/ netapp/ dataontap/ nfs_cmode. py b/modules/ controller/ files/cinder/ volume/ drivers/ netapp/ dataontap/ nfs_cmode. py controller/ files/cinder/ volume/ drivers/ netapp/ dataontap/ nfs_cmode. py controller/ files/cinder/ volume/ drivers/ netapp/ dataontap/ nfs_cmode. py river(nfs_ base.NetAppNfsD river,
files = self.zapi_ client. get_file_ sizes_by_ dir(ssc_ vol_name)
provisioned_ cap = 0
for f in files: utils.extract_ id_from_ volume_ name(f[ 'name'] ): utils.extract_ id_from_ volume_ name(f[ 'name'] ) or \ utils.extract_ id_from_ snapshot_ name(f[ 'name'] ):
provisioned _cap = provisioned_cap + f['file-size']
pool[ 'provisioned_ capacity_ gb'] = na_utils. round_down(
float(provision ed_cap) / units.Gi)
diff --git a/modules/
index fc40f3a..edef16e 100644
--- a/modules/
+++ b/modules/
@@ -290,7 +290,8 @@ class NetAppCmodeNfsD
- if volume_
+ if volume_
+ volume_