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.

Sign up for GitHub

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

Jump to bottom

Set image name to id if name is nil in Glance #3

Merged
merged 1 commit into from Apr 10, 2017
Merged

Set image name to id if name is nil in Glance #3

merged 1 commit into from Apr 10, 2017

Conversation

tzumainn
Copy link
Contributor

@tzumainn tzumainn commented Apr 6, 2017

@Fryguy
Copy link
Member

Fryguy commented Apr 6, 2017

Please rebase...I believe master is now green.

@tzumainn tzumainn closed this Apr 6, 2017
@tzumainn tzumainn reopened this Apr 6, 2017
chessbyte
chessbyte reviewed Apr 6, 2017
View reviewed changes
app/models/manageiq/providers/openstack/refresh_parser_common/images.rb Outdated
@@ -14,7 +14,7 @@ def parse_image(image)
:type => self.class.miq_template_type,
:uid_ems => uid,
:ems_ref => uid,
:name => image.name,
:name => image.name.nil? ? image.id : image.name,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think image.name || image.id is more Ruby-esque.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thanks for passing that along! I'll make the change.

@tzumainn tzumainn requested a review from petrblaho April 7, 2017 13:30
@miq-bot
Copy link
Member

miq-bot commented Apr 7, 2017

Checked commit tzumainn@4a5fd44 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
1 file checked, 0 offenses detected
Everything looks good. 🍰

petrblaho
petrblaho approved these changes Apr 10, 2017
View reviewed changes
Copy link

@petrblaho petrblaho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested.
This PR solves described issue.

@Fryguy Fryguy merged commit afd9f45 into ManageIQ:master Apr 10, 2017
@Fryguy Fryguy added this to the Sprint 58 Ending Apr 10, 2017 milestone Apr 10, 2017
@tzumainn tzumainn mentioned this pull request Apr 10, 2017
Merged
@simaishi
Copy link
Contributor

Fine backport (to manageiq repo) details:

$ git log -1
commit 7098d6a6ac287fd2824cb0b830d69ad7f52c0ce3
Author: Jason Frey <fryguy9@gmail.com>
Date:   Mon Apr 10 10:58:53 2017 -0400

    Merge pull request #3 from tzumainn/image-with-no-name-refresh
    
    Set image name to id if name is nil in Glance
    (cherry picked from commit afd9f457eabbd65d0c8ac61e5037425853f777d4)

@simaishi
Copy link
Contributor

Euwe backport (to manageiq repo) details:

$ git log -1
commit f73ac9d5b04e89e4da6d384a56dc3d4da91b736b
Author: Jason Frey <fryguy9@gmail.com>
Date:   Mon Apr 10 10:58:53 2017 -0400

    Merge pull request #3 from tzumainn/image-with-no-name-refresh
    
    Set image name to id if name is nil in Glance
    (cherry picked from commit afd9f457eabbd65d0c8ac61e5037425853f777d4)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1442164

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chessbyte chessbyte chessbyte left review comments

@petrblaho petrblaho petrblaho approved these changes

Assignees
No one assigned
Labels
bug euwe/backported fine/backported
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@tzumainn @Fryguy @miq-bot @simaishi @chessbyte @petrblaho