Skip to content
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

Merged
merged 4 commits into from
Mar 21, 2018

Conversation

jerryk55
Copy link
Member

@jerryk55 jerryk55 commented Feb 28, 2018

@jerryk55
Copy link
Member Author

Some major issues with the tests caused by this - I'm working on that.

@jerryk55 jerryk55 force-pushed the fix_swift_refresher_when_no_swift branch from d5f79e5 to dbe9bc1 Compare March 20, 2018 14:32
@jerryk55
Copy link
Member Author

@roliveri @hsong-rh tests are green now. Ready for review. Thanks.

@@ -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
Copy link
Member

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.

Copy link
Member Author

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.
@jerryk55 jerryk55 force-pushed the fix_swift_refresher_when_no_swift branch from ae4d22c to d2bf3c8 Compare March 20, 2018 19:17
@jerryk55
Copy link
Member Author

@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.

@miq-bot
Copy link
Member

miq-bot commented Mar 20, 2018

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
3 files checked, 1 offense detected

app/models/manageiq/providers/storage_manager/cinder_manager/refresh_parser.rb

@roliveri roliveri merged commit 9b54d98 into ManageIQ:master Mar 21, 2018
@roliveri roliveri added this to the Sprint 82 Ending Mar 26, 2018 milestone Mar 21, 2018
@simaishi
Copy link
Contributor

@jerryk55 ManageIQ/manageiq-providers-openstack#240 is fine/yes, but this has no fine label. Since they should go together... please make the labels match!

@jerryk55
Copy link
Member Author

@miq-bot add_label fine/yes

simaishi pushed a commit that referenced this pull request Mar 26, 2018
…wift

Fail Cinder/Swift Ensures if Service not Present
(cherry picked from commit 9b54d98)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1560692
@simaishi
Copy link
Contributor

Gaprindashvili backport details:

$ git log -1
commit 866de6965308a03534114496e8bb423bcd188834
Author: Richard Oliveri <[email protected]>
Date:   Wed Mar 21 14:30:20 2018 -0400

    Merge pull request #17067 from jerryk55/fix_swift_refresher_when_no_swift
    
    Fail Cinder/Swift Ensures if Service not Present
    (cherry picked from commit 9b54d9818f7fc709ecf1396cde2ab30d7891cc4f)
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1560692

simaishi pushed a commit that referenced this pull request Apr 9, 2018
…wift

Fail Cinder/Swift Ensures if Service not Present
(cherry picked from commit 9b54d98)

https://bugzilla.redhat.com/show_bug.cgi?id=1560693
@simaishi
Copy link
Contributor

simaishi commented Apr 9, 2018

Fine backport details:

$ git log -1
commit 911187cca1a50bed11d6c33ffb9c91229981d12c
Author: Richard Oliveri <[email protected]>
Date:   Wed Mar 21 14:30:20 2018 -0400

    Merge pull request #17067 from jerryk55/fix_swift_refresher_when_no_swift
    
    Fail Cinder/Swift Ensures if Service not Present
    (cherry picked from commit 9b54d9818f7fc709ecf1396cde2ab30d7891cc4f)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1560693

d-m-u pushed a commit to d-m-u/manageiq that referenced this pull request Jun 6, 2018
…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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants