-
Notifications
You must be signed in to change notification settings - Fork 897
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fail Cinder/Swift Ensures if Service not Present #17067
Fail Cinder/Swift Ensures if Service not Present #17067
Conversation
Some major issues with the tests caused by this - I'm working on that. |
d5f79e5
to
dbe9bc1
Compare
@@ -34,7 +34,7 @@ def ems_inv_to_hashes | |||
end | |||
|
|||
def object_store | |||
return if @swift_service.blank? || @swift_service.name != :swift | |||
return if @swift_service.nil? || @swift_service.blank? || @swift_service.name != :swift |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any reason for adding the extra nil check? nil is blank, so it shouldn't be needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Brain fart. I think I thought about changing it, not adding it. I'll revert that line...
Return false for cinder and swift ensure calls if the service is not present. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1458959 Requires a fix to the Openstack provider as well although order of merges is irrelevant.
In order to allow spec tests to pass the cloud_manager_spec must requires an authentication object for the openstack provider. Also further checks for validity in the refresh parser.
Review comments pointed out the nil check was extraneous.
Typo in safe nav operator - "&" -after the "." instead of before caused an error. Not really needed on the first class so made it match with the swift refresh_parser.
ae4d22c
to
d2bf3c8
Compare
@roliveri I found an error In my log because of a typo in a safe navigation operator. Fixed and ready to be merged when travis has finished. |
Checked commits jerryk55/manageiq@73f42d4~...d2bf3c8 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 app/models/manageiq/providers/storage_manager/cinder_manager/refresh_parser.rb
|
@jerryk55 ManageIQ/manageiq-providers-openstack#240 is |
@miq-bot add_label fine/yes |
…wift Fail Cinder/Swift Ensures if Service not Present (cherry picked from commit 9b54d98) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1560692
Gaprindashvili backport details:
|
…wift Fail Cinder/Swift Ensures if Service not Present (cherry picked from commit 9b54d98) https://bugzilla.redhat.com/show_bug.cgi?id=1560693
Fine backport details:
|
…hen_no_swift Fail Cinder/Swift Ensures if Service not Present (cherry picked from commit 9b54d98) https://bugzilla.redhat.com/show_bug.cgi?id=1560693
Return false for cinder and swift ensure calls if the
service is not present.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1458959
Requires ManageIQ/manageiq-providers-openstack#240
as well although order of merges is irrelevant.
In addition https://bugzilla.redhat.com/show_bug.cgi?id=1538501 fixes a related issue via PR
#16922
@roliveri @hsong-rh please review. Thanks.
Links