From 79212ffdb374d6960bf1a20718ec1acad259c87d Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Wed, 10 Jul 2019 15:13:20 +0000 Subject: [PATCH] Revert "Declare multiattach support for HPE MSA" This reverts commit fc658f492fd3771d20920dcc79c872693bbe6982. While reviewing this patch it was discovered that the multi-attach tempest test cases were not being run against the driver. A bug was found when the tests were enabled. So, this patch should be reverted as the mult-attach support isn't really working. There was discussion that this should be reverted because it was a feature but the team determined it was really a bug fix. If the bug fix is able to be backported the flag can be re-enabled. Change-Id: I089e2728c4253756db7e38e43f505867d23b7d3e --- cinder/tests/unit/volume/drivers/test_dothill.py | 2 -- cinder/volume/drivers/dothill/dothill_common.py | 1 - .../releasenotes/notes/msa-multiattach-5407eb60093de8f1.yaml | 3 --- 3 files changed, 6 deletions(-) delete mode 100644 cinder/volume/drivers/dothill/releasenotes/notes/msa-multiattach-5407eb60093de8f1.yaml diff --git a/cinder/tests/unit/volume/drivers/test_dothill.py b/cinder/tests/unit/volume/drivers/test_dothill.py index 3be5e25c05d..2259b4fd9dd 100644 --- a/cinder/tests/unit/volume/drivers/test_dothill.py +++ b/cinder/tests/unit/volume/drivers/test_dothill.py @@ -406,7 +406,6 @@ class TestFCDotHillCommon(test.TestCase): 'total_capacity_gb': 100}], 'storage_protocol': None, 'vendor_name': 'DotHill', - 'multiattach': True, 'volume_backend_name': None}, self.common.stats) @mock.patch.object(dothill.DotHillClient, 'create_volume') @@ -712,7 +711,6 @@ class TestDotHillFC(test.TestCase): 'driver_version': self.driver.VERSION, 'volume_backend_name': None, 'vendor_name': self.vendor_name, - 'multiattach': True, 'pools': [{'free_capacity_gb': 90, 'reserved_percentage': 0, 'total_capacity_gb': 100, diff --git a/cinder/volume/drivers/dothill/dothill_common.py b/cinder/volume/drivers/dothill/dothill_common.py index e6d24790bd7..e0b1fe2d55d 100644 --- a/cinder/volume/drivers/dothill/dothill_common.py +++ b/cinder/volume/drivers/dothill/dothill_common.py @@ -263,7 +263,6 @@ class DotHillCommon(object): 'storage_protocol': None, 'vendor_name': self.vendor_name, 'volume_backend_name': None, - 'multiattach': True, 'pools': []} pool = {'QoS_support': False} diff --git a/cinder/volume/drivers/dothill/releasenotes/notes/msa-multiattach-5407eb60093de8f1.yaml b/cinder/volume/drivers/dothill/releasenotes/notes/msa-multiattach-5407eb60093de8f1.yaml deleted file mode 100644 index 22450734634..00000000000 --- a/cinder/volume/drivers/dothill/releasenotes/notes/msa-multiattach-5407eb60093de8f1.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -features: - - Support for multiattach is enabled for HPE MSA Storage