Browse Source

Merge "NetApp SolidFire: Enable driver IPv6 api request"

tags/17.0.0.0rc1
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
39a5fd9ba4
3 changed files with 16 additions and 1 deletions
  1. +10
    -0
      cinder/tests/unit/volume/drivers/solidfire/test_solidfire.py
  2. +2
    -1
      cinder/volume/drivers/solidfire.py
  3. +4
    -0
      releasenotes/notes/bp-netapp-solidfire-ipv6-on-management-ip-10187de7b732335a.yaml

+ 10
- 0
cinder/tests/unit/volume/drivers/solidfire/test_solidfire.py View File

@@ -2908,6 +2908,16 @@ class SolidFireVolumeTestCase(test.TestCase):
ep = sfv._build_endpoint_info(mvip='1.2.3.4', password='nunyabiz')
self.assertEqual(expected_ep, ep)

# Make sure we add brackets for IPv6 MVIP
expected_ep = {'passwd': 'nunyabiz',
'url': 'https://[ff00::00]:443',
'svip': None,
'mvip': 'ff00::00',
'login': 'admin',
'port': 443}
ep = sfv._build_endpoint_info(mvip='ff00::00', password='nunyabiz')
self.assertEqual(expected_ep, ep)

def test_generate_random_string(self):
sfv = solidfire.SolidFireDriver(configuration=self.configuration)
a = sfv._generate_random_string(12)


+ 2
- 1
cinder/volume/drivers/solidfire.py View File

@@ -647,7 +647,8 @@ class SolidFireDriver(san.SanISCSIDriver):
kwargs.get('password', backend_conf.san_password))
endpoint['port'] = (
kwargs.get(('port'), backend_conf.sf_api_port))
endpoint['url'] = 'https://%s:%s' % (endpoint['mvip'],
sanitized_mvip = volume_utils.sanitize_host(endpoint['mvip'])
endpoint['url'] = 'https://%s:%s' % (sanitized_mvip,
endpoint['port'])
endpoint['svip'] = kwargs.get('svip', backend_conf.sf_svip)
if not endpoint.get('mvip', None) and kwargs.get('backend_id', None):


+ 4
- 0
releasenotes/notes/bp-netapp-solidfire-ipv6-on-management-ip-10187de7b732335a.yaml View File

@@ -0,0 +1,4 @@
---
features:
- |
SolidFire driver now supports IPv6 for management IP.

Loading…
Cancel
Save