Merge "Huawei: Code cleanup"

diff --cc cinder/tests/unit/test_huawei_drivers.py
index ce58d7dd931ade7c29479968961534940bdb059c,237fe8a4795525f74d3832f4c49c269f3aae13a8..e5b173ed683d45bfdd8f7cfa75824d2b625edcb1
--- 1/cinder/tests/unit/test_huawei_drivers.py
--- 2/cinder/tests/unit/test_huawei_drivers.py
+++ b/cinder/tests/unit/test_huawei_drivers.py
@@@ -2100,24 -2040,7 +2030,22 @@@ class HuaweiISCSIDriverTestCase(test.Te
          self.driver.client.test_fail = True
          self.driver.delete_volume(test_snap)
  
 +    def test_delete_snapshot_with_snapshot_nonexistent(self):
 +        fake_snap = {
 +            'name': 'volume-21ec7341-9256-497b-97d9-ef48edcf0635',
 +            'size': 1,
 +            'volume_name': 'vol1',
 +            'id': '21ec7341-9256-497b-97d9-ef48edcf0635',
 +            'volume_id': '21ec7341-9256-497b-97d9-ef48edcf0635',
 +            'provider_auth': None,
 +            'project_id': 'project',
 +            'display_name': 'vol1',
 +            'display_description': 'test volume',
 +            'volume_type_id': None,
 +            'provider_location': None, }
 +        self.driver.delete_snapshot(fake_snap)
 +
      def test_initialize_connection_fail(self):
- 
          self.driver.client.test_fail = True
  
          self.assertRaises(exception.VolumeBackendAPIException,

diff --cc cinder/volume/drivers/huawei/huawei_driver.py
Simple merge

diff --cc cinder/volume/drivers/huawei/hypermetro.py
Simple merge