openstack/cinder
Code Issues Proposed changes

Merge "HPE 3par iSCSI: getWsApiVersion now requires login" into stable/2024.2

Browse Source
This commit is contained in:
Zuul 2025-01-09 18:48:59 +00:00 committed by Gerrit Code Review
commit b4db712ad0
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cinder/tests/unit/volume/drivers/hpe/test_hpe3par.py
View File

@ -8945,6 +8945,7 @@ class TestHPE3PARISCSIDriver(HPE3PARBaseDriver):
expected_get_ports = [mock.call.getPorts()]
expected_primera = [
mock.call.is_primera_array(),
mock.call.login(HPE3PAR_USER_NAME, HPE3PAR_USER_PASS),
mock.call.getWsApiVersion()]
mock_client.assert_has_calls(
self.standard_login +

4
cinder/volume/drivers/hpe/hpe_3par_iscsi.py
View File

@ -131,10 +131,11 @@ class HPE3PARISCSIDriver(hpebasedriver.HPE3PARDriverBase):
4.0.6 - Allow iSCSI support for Primera 4.2 onwards
4.0.7 - Use vlan iscsi ips. Bug #2015034
4.0.8 - Add ipv6 support. Bug #2045411
4.0.9 - getWsApiVersion now requires login
"""
VERSION = "4.0.8"
VERSION = "4.0.9"
# The name of the CI wiki page.
CI_WIKI_NAME = "HPE_Storage_CI"
@ -147,6 +148,7 @@ class HPE3PARISCSIDriver(hpebasedriver.HPE3PARDriverBase):
client_obj = common.client
is_primera = client_obj.is_primera_array()
if is_primera:
common.client_login()
api_version = client_obj.getWsApiVersion()
array_version = api_version['build']
LOG.debug("array version: %(version)s",