diff --git a/cinder/tests/unit/volume/drivers/ibm/test_storwize_svc.py b/cinder/tests/unit/volume/drivers/ibm/test_storwize_svc.py index 51c7d01343a..105a2a9be9a 100644 --- a/cinder/tests/unit/volume/drivers/ibm/test_storwize_svc.py +++ b/cinder/tests/unit/volume/drivers/ibm/test_storwize_svc.py @@ -8757,7 +8757,7 @@ class StorwizeHelpersTestCase(test.TestCase): {'product_key': storwize_const.DEV_MODEL_STORWIZE_V3500}, {'product_key': - storwize_const.DEV_MODEL_STORWIZE_V3700}, + storwize_const.DEV_MODEL_STORWIZE_V5000E}, {'product_key': storwize_const.DEV_MODEL_SVC}, {'product_key': @@ -8772,10 +8772,10 @@ class StorwizeHelpersTestCase(test.TestCase): storwize_const.DEV_MODEL_FLASH_V9000}, {'product_key': storwize_const.DEV_MODEL_FLEX}] - for i in range(3): + for i in range(2): 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()) @mock.patch.object(storwize_svc_common.StorwizeSSH, 'lsmdiskgrp') diff --git a/cinder/volume/drivers/ibm/storwize_svc/storwize_const.py b/cinder/volume/drivers/ibm/storwize_svc/storwize_const.py index ddfe0786562..593c4b00aae 100644 --- a/cinder/volume/drivers/ibm/storwize_svc/storwize_const.py +++ b/cinder/volume/drivers/ibm/storwize_svc/storwize_const.py @@ -18,7 +18,7 @@ DEV_MODEL_SVC = '2145' DEV_MODEL_STORWIZE = '2076' DEV_MODEL_STORWIZE_V3500 = '2071' -DEV_MODEL_STORWIZE_V3700 = '2072' +DEV_MODEL_STORWIZE_V5000E = '2072' DEV_MODEL_STORWIZE_V7000 = '2076' DEV_MODEL_STORWIZE_V5000 = '2078' 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, DEV_MODEL_STORWIZE_V5000_1YR, DEV_MODEL_FLASH_V9000, - DEV_MODEL_FLEX) + DEV_MODEL_FLEX, DEV_MODEL_STORWIZE_V5000E) # constants used for replication GLOBAL = 'global' diff --git a/releasenotes/notes/bug-1938212-ibm-svf-fix-to-add-replication-support-for-V5000E-e88df9c8eb22c2a8.yaml b/releasenotes/notes/bug-1938212-ibm-svf-fix-to-add-replication-support-for-V5000E-e88df9c8eb22c2a8.yaml new file mode 100644 index 00000000000..947d985d913 --- /dev/null +++ b/releasenotes/notes/bug-1938212-ibm-svf-fix-to-add-replication-support-for-V5000E-e88df9c8eb22c2a8.yaml @@ -0,0 +1,8 @@ +--- +fixes: + - | + IBM Spectrum Virtualize Family driver: `Bug #1938212 + `_: Added + replication license support for FlashSystem V5000E storage + system. Removed support for IBM Storwize V3700 as it + reached End Of Service.