openstack
/
karbor
Code Issues Proposed changes

Merge "Add a filter processing for the parameter of restore"

This commit is contained in:
Jenkins 2016-09-28 07:29:21 +00:00 committed by Gerrit Code Review
parent 554f272a73 b0dc050b2e
commit 7373651144
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
karbor/services/protection/protection_plugins/base_protection_plugin.py
View File

@ -60,7 +60,9 @@ class BaseProtectionPlugin(ProtectionPlugin):
requires = parameters.keys()
requires.append('checkpoint')
elif operation == constants.OPERATION_RESTORE:
parameters.update(context.parameters)
parameters.update(context.parameters.get(resource.type, {}))
res_params = resource.type + '#' + str(resource.id)
parameters.update(context.parameters.get(res_params, {}))
parameters['checkpoint'] = context.checkpoint
parameters['heat_template'] = context.heat_template
inject = parameters