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

Add back the missing IP address range in Virtual Private Cloud name. #16898

Merged
merged 1 commit into from
Jan 26, 2018

Conversation

lfu
Copy link
Member

@lfu lfu commented Jan 26, 2018

IP address range in Virtual Private Cloud name was accidentally removed here.

Includes ManageIQ/manageiq-providers-openstack#211.
Includes ManageIQ/manageiq-providers-google#46.

https://bugzilla.redhat.com/show_bug.cgi?id=1538696

@miq-bot add_label bug, gaprindashvili/yes
@miq-bot assign @gmcculloug

cc @bronaghs

@bronaghs
Copy link

LGTM - thanks @lfu

Copy link
Contributor

@syncrou syncrou left a comment

Choose a reason for hiding this comment

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

👍 Looks great to me @lfu

end
else
load_ar_obj(src[:ems]).all_cloud_networks.each_with_object({}) do |cn, hash|
hash[cn.id] = cn.name
hash[cn.id] = cn.cidr.blank? ? cn.name : "#{cn.name} (#{cn.cidr})"
Copy link
Member

Choose a reason for hiding this comment

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

@lfu Would suggest DRYing up this naming logic since it gets repeated here as well as in some external repos.

def cloud_network_display_name(cn)
  cn.cidr.blank? ? cn.name : "#{cn.name} (#{cn.cidr})"
end

@miq-bot
Copy link
Member

miq-bot commented Jan 26, 2018

Checked commit lfu@95aa300 with ruby 2.3.3, rubocop 0.52.0, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 0 offenses detected
Everything looks fine. 🍰

@bdunne bdunne merged commit 32a131d into ManageIQ:master Jan 26, 2018
@bdunne bdunne added this to the Sprint 78 Ending Jan 29, 2018 milestone Jan 26, 2018
@bdunne bdunne assigned bdunne and unassigned gmcculloug Jan 26, 2018
simaishi pushed a commit that referenced this pull request Jan 29, 2018
Add back the missing IP address range in Virtual Private Cloud name.
(cherry picked from commit 32a131d)

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

Gaprindashvili backport details:

$ git log -1
commit 0d12a3304ec572186eaf12070d4b5fbba0030a68
Author: Brandon Dunne <brandondunne@hotmail.com>
Date:   Fri Jan 26 16:28:30 2018 -0500

    Merge pull request #16898 from lfu/ip_range_azure_1538696
    
    Add back the missing IP address range in Virtual Private Cloud name.
    (cherry picked from commit 32a131df96e4626f9984028ed6240db3191cc89d)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1539730

@lfu lfu deleted the ip_range_azure_1538696 branch February 21, 2018 13:46
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.

7 participants