Gris Ge
2015-06-11 08:10:35 UTC
* Remove unused parameter 'na_disks' of _pool_from_na_aggr().
Signed-off-by: Gris Ge <***@redhat.com>
---
plugin/ontap/ontap.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/plugin/ontap/ontap.py b/plugin/ontap/ontap.py
index 5a01494..d13490d 100644
--- a/plugin/ontap/ontap.py
+++ b/plugin/ontap/ontap.py
@@ -398,7 +398,7 @@ def _status_of_na_aggr(na_aggr):
return status, status_info
- def _pool_from_na_aggr(self, na_aggr, na_disks, flags):
+ def _pool_from_na_aggr(self, na_aggr, flags):
pool_id = na_aggr['name']
pool_name = na_aggr['name']
total_space = int(na_aggr['size-total'])
@@ -562,11 +562,8 @@ def disks(self, search_key=None, search_value=None, flags=0):
def pools(self, search_key=None, search_value=None, flags=0):
pools = []
na_aggrs = self.f.aggregates()
- na_disks = []
- # We do extra flags check in order to save self.f.disks() calls
- # in case we have multiple aggregates.
for na_aggr in na_aggrs:
- pools.extend([self._pool_from_na_aggr(na_aggr, na_disks, flags)])
+ pools.extend([self._pool_from_na_aggr(na_aggr, flags)])
na_vols = self.f.volumes()
for na_vol in na_vols:
pools.extend([self._pool_from_na_vol(na_vol, na_aggrs, flags)])
Signed-off-by: Gris Ge <***@redhat.com>
---
plugin/ontap/ontap.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/plugin/ontap/ontap.py b/plugin/ontap/ontap.py
index 5a01494..d13490d 100644
--- a/plugin/ontap/ontap.py
+++ b/plugin/ontap/ontap.py
@@ -398,7 +398,7 @@ def _status_of_na_aggr(na_aggr):
return status, status_info
- def _pool_from_na_aggr(self, na_aggr, na_disks, flags):
+ def _pool_from_na_aggr(self, na_aggr, flags):
pool_id = na_aggr['name']
pool_name = na_aggr['name']
total_space = int(na_aggr['size-total'])
@@ -562,11 +562,8 @@ def disks(self, search_key=None, search_value=None, flags=0):
def pools(self, search_key=None, search_value=None, flags=0):
pools = []
na_aggrs = self.f.aggregates()
- na_disks = []
- # We do extra flags check in order to save self.f.disks() calls
- # in case we have multiple aggregates.
for na_aggr in na_aggrs:
- pools.extend([self._pool_from_na_aggr(na_aggr, na_disks, flags)])
+ pools.extend([self._pool_from_na_aggr(na_aggr, flags)])
na_vols = self.f.volumes()
for na_vol in na_vols:
pools.extend([self._pool_from_na_vol(na_vol, na_aggrs, flags)])
--
1.8.3.1
1.8.3.1