openstack/cinder
Code Issues Proposed changes

Merge "[SVF]: Fix Enable Replication for Storwize_V5000E"

Browse Source
This commit is contained in:
Zuul 2021-08-09 23:38:25 +00:00 committed by Gerrit Code Review
commit d2dd034cf4
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/tests/unit/volume/drivers/ibm/test_storwize_svc.py
View File

@ -8790,7 +8790,7 @@ class StorwizeHelpersTestCase(test.TestCase):
{'product_key': {'product_key':
storwize_const.DEV_MODEL_STORWIZE_V3500}, storwize_const.DEV_MODEL_STORWIZE_V3500},
{'product_key': {'product_key':
storwize_const.DEV_MODEL_STORWIZE_V3700}, storwize_const.DEV_MODEL_STORWIZE_V5000E},
{'product_key': {'product_key':
storwize_const.DEV_MODEL_SVC}, storwize_const.DEV_MODEL_SVC},
{'product_key': {'product_key':
@ -8805,10 +8805,10 @@ class StorwizeHelpersTestCase(test.TestCase):
storwize_const.DEV_MODEL_FLASH_V9000}, storwize_const.DEV_MODEL_FLASH_V9000},
{'product_key': {'product_key':
storwize_const.DEV_MODEL_FLEX}] storwize_const.DEV_MODEL_FLEX}]
for i in range(3): for i in range(2):
self.assertFalse(self.storwize_svc_common.replication_licensed()) self.assertFalse(self.storwize_svc_common.replication_licensed())
for i in range(7): for i in range(8):
self.assertTrue(self.storwize_svc_common.replication_licensed()) self.assertTrue(self.storwize_svc_common.replication_licensed())
@mock.patch.object(storwize_svc_common.StorwizeSSH, 'lsmdiskgrp') @mock.patch.object(storwize_svc_common.StorwizeSSH, 'lsmdiskgrp')

4
cinder/volume/drivers/ibm/storwize_svc/storwize_const.py
View File

@ -18,7 +18,7 @@
DEV_MODEL_SVC = '2145' DEV_MODEL_SVC = '2145'
DEV_MODEL_STORWIZE = '2076' DEV_MODEL_STORWIZE = '2076'
DEV_MODEL_STORWIZE_V3500 = '2071' DEV_MODEL_STORWIZE_V3500 = '2071'
DEV_MODEL_STORWIZE_V3700 = '2072' DEV_MODEL_STORWIZE_V5000E = '2072'
DEV_MODEL_STORWIZE_V7000 = '2076' DEV_MODEL_STORWIZE_V7000 = '2076'
DEV_MODEL_STORWIZE_V5000 = '2078' DEV_MODEL_STORWIZE_V5000 = '2078'
DEV_MODEL_STORWIZE_V5000_1YR = '2077' DEV_MODEL_STORWIZE_V5000_1YR = '2077'
@ -27,7 +27,7 @@ DEV_MODEL_FLEX = '4939'
REP_CAP_DEVS = (DEV_MODEL_SVC, DEV_MODEL_STORWIZE, DEV_MODEL_STORWIZE_V5000, REP_CAP_DEVS = (DEV_MODEL_SVC, DEV_MODEL_STORWIZE, DEV_MODEL_STORWIZE_V5000,
DEV_MODEL_STORWIZE_V5000_1YR, DEV_MODEL_FLASH_V9000, DEV_MODEL_STORWIZE_V5000_1YR, DEV_MODEL_FLASH_V9000,
DEV_MODEL_FLEX) DEV_MODEL_FLEX, DEV_MODEL_STORWIZE_V5000E)
# constants used for replication # constants used for replication
GLOBAL = 'global' GLOBAL = 'global'

8
releasenotes/notes/bug-1938212-ibm-svf-fix-to-add-replication-support-for-V5000E-e88df9c8eb22c2a8.yaml Normal file
View File

@ -0,0 +1,8 @@
---
fixes:
- |
IBM Spectrum Virtualize Family driver: `Bug #1938212
<https://bugs.launchpad.net/cinder/+bug/1938212>`_: Added
replication license support for FlashSystem V5000E storage
system. Removed support for IBM Storwize V3700 as it
reached End Of Service.