Merge lp://staging/~lamont/maas/bug-1600259 into lp://staging/~maas-committers/maas/trunk
Proposed by
LaMont Jones
| Status: | Merged |
|---|---|
| Approved by: | LaMont Jones |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 5164 |
| Proposed branch: | lp://staging/~lamont/maas/bug-1600259 |
| Merge into: | lp://staging/~maas-committers/maas/trunk |
| Diff against target: |
248 lines (+81/-31) 3 files modified
src/maasserver/dns/zonegenerator.py (+11/-3) src/maasserver/models/staticipaddress.py (+49/-28) src/maasserver/models/tests/test_staticipaddress.py (+21/-0) |
| To merge this branch: | bzr merge lp://staging/~lamont/maas/bug-1600259 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mike Pontillo (community) | Approve | ||
|
Review via email:
|
|||
Commit message
When generating reverse DNS, we have to consider all of the forward zones, not just our subnet.
Description of the change
When generating reverse DNS, we have to consider all of the forward zones, not just our subnet.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I hereby approve this branch... reluctantly. This function is a real nightmare. But I don't have any constructive criticism, so let's go ahead and ship it. We may want to consider writing or using some kind of a framework for generating SQL queries dynamically if this continues...
I would also urge you to measure the code coverage of this function to ensure our tests are covering everything. (I see you added a unit test, too, so that's great.)