Additional fix for hostname validation regex

With the addition of the hostname validation check for Rocky release,
the regex used does not allow for '+' to be used in a hostname. This
breaks the Dell EMC VMAX driver as + symbols are used in constructing
host/pool names. To resolve this issue, add '+' to the regex string.

Change-Id: Ib58741bcf5b1abe7196e9b2ad37d849776b17fbe
Closes-Bug: #1772659
This commit is contained in:
Michael McAleer 2018-05-22 15:19:29 +01:00
parent 910f534382
commit 6e06ab87c0
2 changed files with 3 additions and 2 deletions

View File

@ -221,7 +221,7 @@ hostname = {
# real systems. As it is a cinder host, not a hostname,
# and due to some driver needs, colons and forward slashes
# were also included in the regex.
'pattern': '^[a-zA-Z0-9-._#@:/]*$'
'pattern': '^[a-zA-Z0-9-._#@:/+]*$'
}

View File

@ -202,7 +202,8 @@ class VolumeManageTest(test.TestCase):
return res
@ddt.data({'host': 'host_ok'},
{'host': 'user@host#backend:/vol_path'})
{'host': 'user@host#backend:/vol_path'},
{'host': 'host@backend#parts+of+pool'})
@ddt.unpack
@mock.patch('cinder.volume.api.API.manage_existing', wraps=api_manage)
def test_manage_volume_ok(self, mock_api_manage, host):