openstack/cinder
Code Issues Proposed changes

Merge "Fix LHN driver to allow backend name configuration"

Browse Source
This commit is contained in:
Jenkins 2013-05-03 17:32:29 +00:00 committed by Gerrit Code Review
commit 0793568067
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cinder/volume/drivers/san/hp_lefthand.py
View File

@ -51,13 +51,7 @@ class HpSanISCSIDriver(SanISCSIDriver):
compute layer.
"""
stats = {'driver_version': '1.0',
'free_capacity_gb': 'unknown',
'reserved_percentage': 0,
'storage_protocol': 'iSCSI',
'total_capacity_gb': 'unknown',
'vendor_name': 'Hewlett-Packard',
'volume_backend_name': 'HpSanISCSIDriver'}
device_stats = {}
def __init__(self, *args, **kwargs):
super(HpSanISCSIDriver, self).__init__(*args, **kwargs)
@ -296,14 +290,25 @@ class HpSanISCSIDriver(SanISCSIDriver):
def get_volume_stats(self, refresh):
if refresh:
cliq_args = {}
result_xml = self._cliq_run_xml("getClusterInfo", cliq_args)
cluster_node = result_xml.find("response/cluster")
total_capacity = cluster_node.attrib.get("spaceTotal")
free_capacity = cluster_node.attrib.get("unprovisionedSpace")
GB = 1073741824
self._update_backend_status()
self.stats['total_capacity_gb'] = int(total_capacity) / GB
self.stats['free_capacity_gb'] = int(free_capacity) / GB
return self.device_stats
return self.stats
def _update_backend_status(self):
data = {}
backend_name = self.configuration.safe_get('volume_backend_name')
data['volume_backend_name'] = backend_name or self.__class__.__name__
data['driver_version'] = '1.0'
data['reserved_percentage'] = 0
data['storage_protocol'] = 'iSCSI'
data['vendor_name'] = 'Hewlett-Packard'
result_xml = self._cliq_run_xml("getClusterInfo", {})
cluster_node = result_xml.find("response/cluster")
total_capacity = cluster_node.attrib.get("spaceTotal")
free_capacity = cluster_node.attrib.get("unprovisionedSpace")
GB = 1073741824
data['total_capacity_gb'] = int(total_capacity) / GB
data['free_capacity_gb'] = int(free_capacity) / GB
self.device_stats = data