openstack
/
cinder
Code Issues Proposed changes

Merge "PowerMax Driver - Snapshot restore payload fix" into stable/stein

This commit is contained in:
Zuul 2020-07-15 03:17:59 +00:00 committed by Gerrit Code Review
parent e5066bf2a6 70ab1b359a
commit 5edb3a0b2c
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cinder/tests/unit/volume/drivers/dell_emc/powermax/test_powermax_rest.py
View File

@ -1066,7 +1066,6 @@ class PowerMaxRestTest(test.TestCase):
'symforce': 'false', 'nocopy': 'false', 'symforce': 'false', 'nocopy': 'false',
'generation': 0} 'generation': 0}
payload_restore = {'deviceNameListSource': [{'name': source_id}], payload_restore = {'deviceNameListSource': [{'name': source_id}],
'deviceNameListTarget': [{'name': source_id}],
'action': 'Restore', 'action': 'Restore',
'star': 'false', 'force': 'false'} 'star': 'false', 'force': 'false'}
with mock.patch.object( with mock.patch.object(

1
cinder/volume/drivers/dell_emc/powermax/rest.py
View File

@ -1791,7 +1791,6 @@ class PowerMaxRest(object):
if action == "Restore": if action == "Restore":
operation = 'Restore snapVx snapshot' operation = 'Restore snapVx snapshot'
payload = {"deviceNameListSource": [{"name": source_id}], payload = {"deviceNameListSource": [{"name": source_id}],
"deviceNameListTarget": [{"name": source_id}],
"action": action, "action": action,
"star": 'false', "force": 'false'} "star": 'false', "force": 'false'}
elif action in ('Link', 'Unlink'): elif action in ('Link', 'Unlink'):