Fixes #16439 - Don't fail recreate if DNS is ok #3812
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -35,7 +35,7 @@ def dns_feasible?(type) | |||
| end | |||
|
|
|||
| def recreate_dns_record(type) | |||
| set_dns_record(type) unless dns_record(type).nil? || dns_record(type).valid? | |||
| dns_record(type).nil? || dns_record(type).valid? ? true : set_dns_record(type) | |||
There was a problem hiding this comment.
I think, a guard clause would make this more readable.
def recreate_dns_record(type)
return true if dns_record(type).nil? || dns_record(type).valid?
set_dns_record(type)
end
|
@agx: Thanks for the patch. It looks good to me. Could you just add a tiny unit test for this? |
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
|
|
||
| context 'dns not feasible' do | ||
| test 'should not fail dns rebuild' do | ||
| Nic::Managed.any_instance.stubs(:dns_feasible?).returns(false) |
There was a problem hiding this comment.
Use 2 (not 3) spaces for indentation.
|
@timogoebel test added and code changed as suggested |
If rebuilding a host and DNS is not "feasible" we don't want to fail that host but rather recreate what's currently feasible. If a DNS record is still valid we don't want to fail that host but rather take the still valid entry.
|
[test foreman] |
|
@agx: Looks good, thank you. Test results are unrelated. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If rebuilding a host and DNS is not "feasible" we don't want to fail
that host but rather recreate what's currently feasible.
If a DNS record is still valid we don't want to fail that host but
rather take the still valid entry.