openstack/cinder
Code Issues Proposed changes

Merge "HPMSA: Report SAN driver options"

Browse Source
This commit is contained in:
Zuul 2021-06-23 19:01:33 +00:00 committed by Gerrit Code Review
commit 8d8464a000
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/volume/drivers/san/hp/hpmsa_common.py
View File

@ -17,6 +17,7 @@
from oslo_config import cfg
from cinder.volume import configuration
from cinder.volume import driver
import cinder.volume.drivers.san.hp.hpmsa_client as hpmsa_client
import cinder.volume.drivers.stx.common as common
@ -83,3 +84,10 @@ class HPMSACommon(common.STXCommon):
self.config.san_password,
self.api_protocol,
ssl_verify)
@staticmethod
def get_driver_options():
additional_opts = driver.BaseVD._get_oslo_driver_opts(
'san_ip', 'san_login', 'san_password', 'driver_use_ssl',
'driver_ssl_cert_verify', 'driver_ssl_cert_path')
return common_opts + additional_opts

2
cinder/volume/drivers/san/hp/hpmsa_fc.py
View File

@ -45,7 +45,7 @@ class HPMSAFCDriver(fc.STXFCDriver):
@staticmethod
def get_driver_options():
return hpmsa_common.common_opts
return hpmsa_common.HPMSACommon.get_driver_options()
def _init_common(self):
return hpmsa_common.HPMSACommon(self.configuration)

3
cinder/volume/drivers/san/hp/hpmsa_iscsi.py
View File

@ -47,7 +47,8 @@ class HPMSAISCSIDriver(iscsi.STXISCSIDriver):
@staticmethod
def get_driver_options():
return hpmsa_common.common_opts + hpmsa_common.iscsi_opts
return (hpmsa_common.HPMSACommon.get_driver_options() +
hpmsa_common.iscsi_opts)
def _init_common(self):
return hpmsa_common.HPMSACommon(self.configuration)