Limit CloudTenants' related VMs to the non-archived ones #15329
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
Ladas
reviewed
Jun 7, 2017
app/models/cloud_tenant.rb
Outdated
| @@ -158,4 +158,8 @@ def self.post_refresh_ems(ems_id, _) | |||
| def self.tenant_joins_clause(scope) | |||
| scope.includes(:source_tenant).includes(:ext_management_system) | |||
| end | |||
|
|
|||
| def active_vms | |||
| vms.where.not(:ems_id => nil) | |||
There was a problem hiding this comment.
we should have in VmOrTemplate
scope :active, -> { where.not(:ems_id => nil) }then here:
has_many :active_vms, -> {active}, :foreign_key => :cloud_tenant_id, :class_name => "Vm"
skateman
force-pushed
the
cloud-tenant-active-vms
branch
from
88f2d4e to
870fc28
Compare
Ladas
reviewed
Jun 7, 2017
app/models/cloud_tenant.rb
Outdated
| @@ -14,6 +14,7 @@ class CloudTenant < ApplicationRecord | |||
| has_many :network_routers | |||
| has_many :vms | |||
| has_many :vms_and_templates | |||
| has_many :active_vms, -> { active }, :foreign_key => :cloud_tenant_id, :class_name => "Vm" | |||
There was a problem hiding this comment.
might be that we just need has_many :vms, -> { active }
it's consistent with the behavior elsewhere, where we delete e.g. availability_zone_id. Seems like we've forgot to delete the cloud_tenant_id here. So has_mane :vms, -> { active } is equivalent to having cloud_tenant_id deleted, but it's cleaner because we can keep the foreign key.
There was a problem hiding this comment.
but it might break existing reports relying on that relation
skateman
force-pushed
the
cloud-tenant-active-vms
branch
from
870fc28 to
5116d71
Compare
skateman
changed the title
lpichler
approved these changes
Jun 8, 2017
|
restart ci |
skateman
force-pushed
the
cloud-tenant-active-vms
branch
from
5116d71 to
0f49153
Compare
skateman
force-pushed
the
cloud-tenant-active-vms
branch
from
0f49153 to
8ea6c77
Compare
|
Checked commit skateman@8ea6c77 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0 |
|
@miq-bot assign @blomquisg |
simaishi
pushed a commit
that referenced
this pull request
Jun 14, 2017
Limit CloudTenants' related VMs to the non-archived ones (cherry picked from commit 9e19b17) https://bugzilla.redhat.com/show_bug.cgi?id=1461596
|
Fine backport details: |
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.
When archiving a cloud instance, its cloud tenant value does not get nullified. This causes the cloud topology screen to render unwanted archived VMs. This method filters out the archived VMs and I'm planning to use it in the topology service.
https://bugzilla.redhat.com/show_bug.cgi?id=1456031