Update catalog item without config_options #14147
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@jntullo https://github.com/ManageIQ/manageiq/blob/master/app/models/service_template.rb#L429 the validation on the |
bzwei
reviewed
Mar 3, 2017
| @@ -426,7 +427,11 @@ def build_resource_action(ae_endpoint, action) | |||
| end | |||
|
|
|||
| def validate_update_config_info(options) | |||
| raise _('service_type and prov_type cannot be changed') if options[:service_type] || options[:prov_type] | |||
| if options[:service_type] && options[:service_type] != service_type | |||
There was a problem hiding this comment.
should be two independent if...end blocks
bzwei
reviewed
Mar 3, 2017
| @@ -87,6 +87,27 @@ | |||
| expect(updated.resource_actions.pluck(:action)).to match_array(%w(Provision Reconfigure)) | |||
| end | |||
|
|
|||
| it 'does not allow service_type to be changed' do | |||
There was a problem hiding this comment.
We may not need to repeat tests that are already covered in base class.
There was a problem hiding this comment.
@bzwei ok - just thought it would be a good idea to ensure that it includes the super class method call
|
Checked commits jntullo/manageiq@a8947bc~...4aafba6 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0 |
bzwei
approved these changes
Mar 3, 2017
|
@miq-bot assign @gmcculloug |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will update the catalog item without the need for
config_options. Will update #14068 based off of this.@miq-bot add_label enhancement, services
@miq-bot assign @bzwei
cc: @abellotti