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

Fixes #19623 - add comparison to portkey for vmware networks #4611

Merged

Conversation

wiad
Copy link
Contributor

@wiad wiad commented Jun 22, 2017

@mention-bot
Copy link

@wiad, thanks for your PR! By analyzing the history of the files in this pull request, we identified @ohadlevy, @isratrade and @ares to be potential reviewers.

@theforeman-bot
Copy link
Member

Do not merge! This patch has not been tested yet.

Can an existing organization member please verify this patch?

2 similar comments
@theforeman-bot
Copy link
Member

Do not merge! This patch has not been tested yet.

Can an existing organization member please verify this patch?

@theforeman-bot
Copy link
Member

Do not merge! This patch has not been tested yet.

Can an existing organization member please verify this patch?

@theforeman-bot
Copy link
Member

Issues: #19623

@dLobatog
Copy link
Member

[test upgrade]
[test katello]
[test foreman]

(this triggers our CI test)

@@ -40,6 +40,7 @@ def select_nic(fog_nics, nic)
all_networks = service.raw_networks(datacenter)
vm_network = all_networks.detect { |network| network._ref == nic_attrs['network'] }
vm_network ||= all_networks.detect { |network| network.name == nic_attrs['network'] }
vm_network ||= all_networks.detect { |network| network.key == nic_attrs['network'] }
Copy link
Member

Choose a reason for hiding this comment

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

Nitpick, you may as well put everything on the same line:

          vm_network ||= all_networks.detect { |network| [network.name, network.key].include? nic_attrs['network'] } 

@theforeman-bot
Copy link
Member

There were the following issues with the commit message:

  • 31c711a must be in the format fixes #redmine_number - brief description

If you don't have a ticket number, please create an issue in Redmine.

More guidelines are available in Coding Standards or on the Foreman wiki.


This message was auto-generated by Foreman's prprocessor

@timogoebel
Copy link
Member

@dLobatog: I can't test the issue described in the ticket, but I'll be happy to test this for regressions & merge this next week.

Copy link
Member

@dLobatog dLobatog left a comment

Choose a reason for hiding this comment

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

@timogoebel Don't worry, I tested just the basic case. The proper fix has to come through fog-vmware though. If tests pass I'll merge.

@wiad Remember to make the commits compliant with @theforeman-bot 's message tips 😉 #4611 (comment) It helps with our automation. Don't worry now though, I will just rebase your two commits into one with the right title.

@wiad
Copy link
Contributor Author

wiad commented Jun 27, 2017

@dLobatog yeah, I forgot the commit message style convention in the last commit but hoped it would be ok anyway - thanks! I'll remember it next time.

@dLobatog
Copy link
Member

[test upgrade]
[test katello]
[test foreman]

@dLobatog dLobatog merged commit cccc26e into theforeman:develop Jun 27, 2017
@dLobatog
Copy link
Member

Thanks @wiad !

@wiad wiad deleted the 19623-add_vm_network_comparison_to_portkey branch July 5, 2017 06:00
This pull request was closed.
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