Service#my_zone should only reference a VM associated to a provider. #14696
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
gmcculloug
force-pushed
the
service_my_zone_with_archived_vm
branch
from
198242b to
08a473d
Compare
bzwei
approved these changes
Apr 7, 2017
isimluk
approved these changes
Apr 9, 2017
bdunne
requested changes
Apr 10, 2017
spec/models/service_spec.rb
Outdated
| end | ||
|
|
||
| it 'returns the provider zone when the VM is connected to a provider' do | ||
| provider = FactoryGirl.create(:ext_management_system, :zone => FactoryGirl.create(:zone)) |
There was a problem hiding this comment.
Can this be manager or ems instead since it's not a Provider?
spec/models/service_spec.rb
Outdated
| it 'returns the provider zone with one VM connected to a provider and one archived' do | ||
| service.add_resource!(FactoryGirl.build(:vm_vmware)) | ||
|
|
||
| provider = FactoryGirl.create(:ext_management_system, :zone => FactoryGirl.create(:zone)) |
gmcculloug
force-pushed
the
service_my_zone_with_archived_vm
branch
from
08a473d to
46b7f9f
Compare
|
Checked commit gmcculloug@46b7f9f with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0 |
bdunne
approved these changes
Apr 10, 2017
simaishi
pushed a commit
that referenced
this pull request
Apr 11, 2017
…ed_vm Service#my_zone should only reference a VM associated to a provider. (cherry picked from commit 6a23f36) https://bugzilla.redhat.com/show_bug.cgi?id=1441249
|
Fine backport details: |
simaishi
pushed a commit
that referenced
this pull request
Apr 17, 2017
…ed_vm Service#my_zone should only reference a VM associated to a provider. (cherry picked from commit 6a23f36) https://bugzilla.redhat.com/show_bug.cgi?id=1441251
|
Euwe 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.
Services do not have an inherent zone association. When one is desired, for example when running a custom button, we look at the associated VMs to select a zone. The current logic always uses the first VM from the list of
vms. If that VM happens to be archived/orphaned (not associated with a provider) the logic raises an error. The new logic checks that the VM has a valid provider before accessing the zone name.Note: The
Vmmodel contains amy_zonemethod which handles anilprovider, but in that scenario it returns the current MiqServer zone name which is not the desired result.Links [Optional]
Steps for Testing/QA
Options 1: Follow step list in BZ to recreate issue.
Options 2:
Run the following steps in the rails console (before changes):
After applying the changes
s.my_zonewill returnnilfor the error case above.