Merge "Storwize: add config option to control flash copy rate"

diff --cc cinder/tests/unit/test_storwize_svc.py
index 940d7a5dd145e762c5a24dc907bad27707803013,19ffb10d1f2c8006b920e123baa7974b8d106609..baa3389a139745dc44d7d12b3fd843001acdaa7c
--- 1/cinder/tests/unit/test_storwize_svc.py
--- 2/cinder/tests/unit/test_storwize_svc.py
+++ b/cinder/tests/unit/test_storwize_svc.py
@@@ -1753,8 -1743,10 +1753,9 @@@ class StorwizeSVCDriverTestCase(test.Te
                                 'san_password': 'pass',
                                 'storwize_svc_volpool_name': 'openstack',
                                 'storwize_svc_flashcopy_timeout': 20,
+                                'storwize_svc_flashcopy_rate': 49,
                                 # Test ignore capitalization
                                 'storwize_svc_connection_protocol': 'iScSi',
 -                               'storwize_svc_multipath_enabled': False,
                                 'storwize_svc_allow_tenant_qos': True}
              wwpns = [str(random.randint(0, 9999999999999999)).zfill(16),
                       str(random.randint(0, 9999999999999999)).zfill(16)]

diff --cc cinder/volume/drivers/ibm/storwize_svc/__init__.py
Simple merge

diff --cc cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
Simple merge