Cleaned duplicate dictionary values

Change-Id: I2a94ab9d282599bf3aeffb1bf32da6c43c9887f7

diff --git a/cinder/tests/unit/test_gpfs.py b/cinder/tests/unit/test_gpfs.py
index e6617373a2d8352931e226c152942d7aa4ae1485..e8a15188081a46c7eb91fbcd3e03118b603adbdc 100644 (file)
--- a/cinder/tests/unit/test_gpfs.py
+++ b/cinder/tests/unit/test_gpfs.py
@@ -695,7 +695,6 @@ class GPFSDriverTestCase(test.TestCase):
                     'write_affinity_depth': 'test',
                     'block_group_factor': 'test',
                     'write_affinity_failure_group': 'test',
-                    'test': 'test',
                     'fstype': 'test',
                     'fslabel': 'test',
                     'test': 'test'}

diff --git a/cinder/tests/unit/test_huawei_drivers.py b/cinder/tests/unit/test_huawei_drivers.py
index c5e212797aa35030d880c084563c854320fde407..5bfce15915e4a91ac1bc8766fc49d039c5d326ed 100644 (file)
--- a/cinder/tests/unit/test_huawei_drivers.py
+++ b/cinder/tests/unit/test_huawei_drivers.py
@@ -137,8 +137,8 @@ test_snap = {'name': 'volume-21ec7341-9256-497b-97d9-ef48edcf0635',
              'display_description': 'test volume',
              'volume_type_id': None,
              'provider_location': '11',
-             'volume': {"volume_id": '21ec7341-9256-497b-97d9-ef48edcf0635'},
-             'volume': {'provider_location': '12'},
+             'volume': {"volume_id": '21ec7341-9256-497b-97d9-ef48edcf0635',
+                        'provider_location': '12'},
              }
 
 test_host = {'host': 'ubuntu001@backend001#OpenStack_Pool',

diff --git a/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py b/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
index 34ce1a334ca330098520131aef01aa3a38341d45..f3cfa3471bde35c556c8bbb4a235c9774d7cb418 100644 (file)
--- a/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
+++ b/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
@@ -3007,7 +3007,6 @@ class StorwizeSVCCommonDriver(san.SanDriver,
                     'total_capacity_gb': total_capacity_gb,
                     'free_capacity_gb': free_capacity_gb,
                     'allocated_capacity_gb': allocated_capacity_gb,
-                    'easytier_support': easy_tier,
                     'compression_support': self._state['compression_enabled'],
                     'reserved_percentage':
                         self.configuration.reserved_percentage,