Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix accessing to optional cinder pool attributes"

Browse Source
This commit is contained in:
Zuul
2018-11-08 01:14:04 +00:00
committed by Gerrit Code Review
parent 7118545e97 e8c08e2abb
commit cf31b7fb34
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
watcher/decision_engine/model/collector/cinder.py
View File

@@ -230,21 +230,17 @@ class ModelBuilder(object):
"free_capacity_gb", "provisioned_capacity_gb", "free_capacity_gb", "provisioned_capacity_gb",
"allocated_capacity_gb"] "allocated_capacity_gb"]
node_attributes = {"name": pool.name}
for attr in attrs: for attr in attrs:
try: try:
int(getattr(pool, attr)) node_attributes[attr] = int(getattr(pool, attr))
except AttributeError:
LOG.debug("Attribute %s for pool %s is not provided",
attr, pool.name)
except ValueError: except ValueError:
raise exception.InvalidPoolAttributeValue( raise exception.InvalidPoolAttributeValue(
name=pool.name, attribute=attr) name=pool.name, attribute=attr)
node_attributes = {
"name": pool.name,
"total_volumes": pool.total_volumes,
"total_capacity_gb": pool.total_capacity_gb,
"free_capacity_gb": pool.free_capacity_gb,
"provisioned_capacity_gb": pool.provisioned_capacity_gb,
"allocated_capacity_gb": pool.allocated_capacity_gb}
storage_pool = element.Pool(**node_attributes) storage_pool = element.Pool(**node_attributes)
return storage_pool return storage_pool