Remove openstack infra provider from network actions #3367
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
alexander-demicev
changed the title
lpichler
reviewed
Feb 5, 2018
| @@ -4,6 +4,7 @@ module ApplicationController::Network | |||
| def network_managers | |||
| openstack_network_manager = Rbac::Filterer.filtered(ManageIQ::Providers::Openstack::NetworkManager).select(:id, :name, :parent_ems_id) | |||
| redhat_network_manager = Rbac::Filterer.filtered(ManageIQ::Providers::Redhat::NetworkManager).select(:id, :name, :parent_ems_id) | |||
| openstack_network_manager = openstack_network_manager.select { |manager| EmsCloud.find_by_id(manager.parent_ems_id) } | |||
There was a problem hiding this comment.
I am think you can change input query for RBAC of openstack_network_manager (and we will avoid N+1)
ManageIQ::Providers::Openstack::NetworkManager.joins(:parent_manager).where(:parent_managers_ext_management_systems=>{:type=>'ManageIQ::Providers::Openstack::CloudManager'})please check whether stated type 'ManageIQ::Providers::Openstack::CloudManager' is enough.
There was a problem hiding this comment.
Done :) Thanks for review.
alexander-demicev
force-pushed
the
improve-filtering
branch
from
9ea15eb
to
58e9f54
Compare
|
Checked commit alexander-demicev@58e9f54 with ruby 2.3.3, rubocop 0.52.0, haml-lint 0.20.0, and yamllint 1.10.0 |
lpichler
approved these changes
Feb 5, 2018
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 PR removes infra provider from filtered result, because actions like creating networks, assigning FIP, etc. do not work for OpenStack infra provider.
Not sure if removing from filtered result should be done here or should be moved inside controllers.
ping @lpichler @aufi
https://github.com/ManageIQ/manageiq-ui-classic/pull/3367/files