HP 3PAR driver config has unused username/password
Removed all references to hp3par_username and hp3par_password in the code and documentation as it is currently not used. Closes-Bug: 1463942 Change-Id: I4dd459077fdeb3387f08cfc0ea08948685e6f4cb
This commit is contained in:
parent
b2e7a05ec3
commit
2b7c63487d
@ -88,8 +88,6 @@ file for the HP 3PAR driver:
|
|||||||
- `hp3par_share_ip_address` = <IP address to use for share export location>
|
- `hp3par_share_ip_address` = <IP address to use for share export location>
|
||||||
- `hp3par_san_ip` = <IP address for SSH access to the SAN controller>
|
- `hp3par_san_ip` = <IP address for SSH access to the SAN controller>
|
||||||
- `hp3par_api_url` = <3PAR WS API Server URL>
|
- `hp3par_api_url` = <3PAR WS API Server URL>
|
||||||
- `hp3par_username` = <3PAR superuser username>
|
|
||||||
- `hp3par_password` = <3PAR superuser password>
|
|
||||||
- `hp3par_san_login` = <Username for SSH access to the SAN controller>
|
- `hp3par_san_login` = <Username for SSH access to the SAN controller>
|
||||||
- `hp3par_san_password` = <Password for SSH access to the SAN controller>
|
- `hp3par_san_password` = <Password for SSH access to the SAN controller>
|
||||||
- `hp3par_debug` = <False or True for extra debug logging>
|
- `hp3par_debug` = <False or True for extra debug logging>
|
||||||
|
@ -34,13 +34,6 @@ HP3PAR_OPTS = [
|
|||||||
default='',
|
default='',
|
||||||
help="3PAR WSAPI Server Url like "
|
help="3PAR WSAPI Server Url like "
|
||||||
"https://<3par ip>:8080/api/v1"),
|
"https://<3par ip>:8080/api/v1"),
|
||||||
cfg.StrOpt('hp3par_username',
|
|
||||||
default='',
|
|
||||||
help="3PAR Super user username"),
|
|
||||||
cfg.StrOpt('hp3par_password',
|
|
||||||
default='',
|
|
||||||
help="3PAR Super user password",
|
|
||||||
secret=True),
|
|
||||||
cfg.StrOpt('hp3par_san_ip',
|
cfg.StrOpt('hp3par_san_ip',
|
||||||
default='',
|
default='',
|
||||||
help="IP address of SAN controller"),
|
help="IP address of SAN controller"),
|
||||||
@ -107,8 +100,6 @@ class HP3ParShareDriver(driver.ShareDriver):
|
|||||||
"hp3par_share_ip_address is not set."))
|
"hp3par_share_ip_address is not set."))
|
||||||
|
|
||||||
mediator = hp_3par_mediator.HP3ParMediator(
|
mediator = hp_3par_mediator.HP3ParMediator(
|
||||||
hp3par_username=self.configuration.hp3par_username,
|
|
||||||
hp3par_password=self.configuration.hp3par_password,
|
|
||||||
hp3par_api_url=self.configuration.hp3par_api_url,
|
hp3par_api_url=self.configuration.hp3par_api_url,
|
||||||
hp3par_debug=self.configuration.hp3par_debug,
|
hp3par_debug=self.configuration.hp3par_debug,
|
||||||
hp3par_san_ip=self.configuration.hp3par_san_ip,
|
hp3par_san_ip=self.configuration.hp3par_san_ip,
|
||||||
|
@ -44,8 +44,6 @@ class HP3ParMediator(object):
|
|||||||
|
|
||||||
def __init__(self, **kwargs):
|
def __init__(self, **kwargs):
|
||||||
|
|
||||||
self.hp3par_username = kwargs.get('hp3par_username')
|
|
||||||
self.hp3par_password = kwargs.get('hp3par_password')
|
|
||||||
self.hp3par_api_url = kwargs.get('hp3par_api_url')
|
self.hp3par_api_url = kwargs.get('hp3par_api_url')
|
||||||
self.hp3par_debug = kwargs.get('hp3par_debug')
|
self.hp3par_debug = kwargs.get('hp3par_debug')
|
||||||
self.hp3par_san_ip = kwargs.get('hp3par_san_ip')
|
self.hp3par_san_ip = kwargs.get('hp3par_san_ip')
|
||||||
|
@ -34,8 +34,6 @@ class HP3ParDriverTestCase(test.TestCase):
|
|||||||
self.conf = mock.Mock()
|
self.conf = mock.Mock()
|
||||||
self.conf.driver_handles_share_servers = False
|
self.conf.driver_handles_share_servers = False
|
||||||
self.conf.hp3par_debug = constants.EXPECTED_HP_DEBUG
|
self.conf.hp3par_debug = constants.EXPECTED_HP_DEBUG
|
||||||
self.conf.hp3par_username = constants.USERNAME
|
|
||||||
self.conf.hp3par_password = constants.PASSWORD
|
|
||||||
self.conf.hp3par_api_url = constants.API_URL
|
self.conf.hp3par_api_url = constants.API_URL
|
||||||
self.conf.hp3par_san_login = constants.SAN_LOGIN
|
self.conf.hp3par_san_login = constants.SAN_LOGIN
|
||||||
self.conf.hp3par_san_password = constants.SAN_PASSWORD
|
self.conf.hp3par_san_password = constants.SAN_PASSWORD
|
||||||
@ -72,11 +70,9 @@ class HP3ParDriverTestCase(test.TestCase):
|
|||||||
self.mock_mediator_constructor.assert_has_calls([
|
self.mock_mediator_constructor.assert_has_calls([
|
||||||
mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port,
|
mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port,
|
||||||
hp3par_san_password=conf.hp3par_san_password,
|
hp3par_san_password=conf.hp3par_san_password,
|
||||||
hp3par_username=conf.hp3par_username,
|
|
||||||
hp3par_san_login=conf.hp3par_san_login,
|
hp3par_san_login=conf.hp3par_san_login,
|
||||||
hp3par_debug=conf.hp3par_debug,
|
hp3par_debug=conf.hp3par_debug,
|
||||||
hp3par_api_url=conf.hp3par_api_url,
|
hp3par_api_url=conf.hp3par_api_url,
|
||||||
hp3par_password=conf.hp3par_password,
|
|
||||||
hp3par_san_ip=conf.hp3par_san_ip,
|
hp3par_san_ip=conf.hp3par_san_ip,
|
||||||
hp3par_fstore_per_share=conf.hp3par_fstore_per_share,
|
hp3par_fstore_per_share=conf.hp3par_fstore_per_share,
|
||||||
ssh_conn_timeout=conf.ssh_conn_timeout)])
|
ssh_conn_timeout=conf.ssh_conn_timeout)])
|
||||||
@ -100,11 +96,9 @@ class HP3ParDriverTestCase(test.TestCase):
|
|||||||
self.mock_mediator_constructor.assert_has_calls([
|
self.mock_mediator_constructor.assert_has_calls([
|
||||||
mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port,
|
mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port,
|
||||||
hp3par_san_password=conf.hp3par_san_password,
|
hp3par_san_password=conf.hp3par_san_password,
|
||||||
hp3par_username=conf.hp3par_username,
|
|
||||||
hp3par_san_login=conf.hp3par_san_login,
|
hp3par_san_login=conf.hp3par_san_login,
|
||||||
hp3par_debug=conf.hp3par_debug,
|
hp3par_debug=conf.hp3par_debug,
|
||||||
hp3par_api_url=conf.hp3par_api_url,
|
hp3par_api_url=conf.hp3par_api_url,
|
||||||
hp3par_password=conf.hp3par_password,
|
|
||||||
hp3par_san_ip=conf.hp3par_san_ip,
|
hp3par_san_ip=conf.hp3par_san_ip,
|
||||||
hp3par_fstore_per_share=conf.hp3par_fstore_per_share,
|
hp3par_fstore_per_share=conf.hp3par_fstore_per_share,
|
||||||
ssh_conn_timeout=conf.ssh_conn_timeout)])
|
ssh_conn_timeout=conf.ssh_conn_timeout)])
|
||||||
@ -124,11 +118,9 @@ class HP3ParDriverTestCase(test.TestCase):
|
|||||||
self.mock_mediator_constructor.assert_has_calls([
|
self.mock_mediator_constructor.assert_has_calls([
|
||||||
mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port,
|
mock.call(hp3par_san_ssh_port=conf.hp3par_san_ssh_port,
|
||||||
hp3par_san_password=conf.hp3par_san_password,
|
hp3par_san_password=conf.hp3par_san_password,
|
||||||
hp3par_username=conf.hp3par_username,
|
|
||||||
hp3par_san_login=conf.hp3par_san_login,
|
hp3par_san_login=conf.hp3par_san_login,
|
||||||
hp3par_debug=conf.hp3par_debug,
|
hp3par_debug=conf.hp3par_debug,
|
||||||
hp3par_api_url=conf.hp3par_api_url,
|
hp3par_api_url=conf.hp3par_api_url,
|
||||||
hp3par_password=conf.hp3par_password,
|
|
||||||
hp3par_san_ip=conf.hp3par_san_ip,
|
hp3par_san_ip=conf.hp3par_san_ip,
|
||||||
hp3par_fstore_per_share=conf.hp3par_fstore_per_share,
|
hp3par_fstore_per_share=conf.hp3par_fstore_per_share,
|
||||||
ssh_conn_timeout=conf.ssh_conn_timeout)])
|
ssh_conn_timeout=conf.ssh_conn_timeout)])
|
||||||
|
@ -53,8 +53,6 @@ class HP3ParMediatorTestCase(test.TestCase):
|
|||||||
|
|
||||||
# Set the mediator to use in tests.
|
# Set the mediator to use in tests.
|
||||||
self.mediator = hp3parmediator.HP3ParMediator(
|
self.mediator = hp3parmediator.HP3ParMediator(
|
||||||
hp3par_username=constants.USERNAME,
|
|
||||||
hp3par_password=constants.PASSWORD,
|
|
||||||
hp3par_api_url=constants.API_URL,
|
hp3par_api_url=constants.API_URL,
|
||||||
hp3par_debug=constants.EXPECTED_HP_DEBUG,
|
hp3par_debug=constants.EXPECTED_HP_DEBUG,
|
||||||
hp3par_san_ip=constants.EXPECTED_IP_1234,
|
hp3par_san_ip=constants.EXPECTED_IP_1234,
|
||||||
|
Loading…
Reference in New Issue
Block a user