Merge lp:~rvb/maas/bug-1070765-hostname into lp:~maas-committers/maas/trunk
Proposed by
Raphaël Badin
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Raphaël Badin | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 1316 | ||||
Proposed branch: | lp:~rvb/maas/bug-1070765-hostname | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
240 lines (+73/-23) 8 files modified
src/maasserver/api.py (+2/-1) src/maasserver/forms.py (+14/-1) src/maasserver/models/dhcplease.py (+1/-5) src/maasserver/tests/test_api.py (+19/-0) src/maasserver/tests/test_dhcplease.py (+0/-15) src/maasserver/tests/test_forms.py (+16/-1) src/maasserver/utils/__init__.py (+6/-0) src/maasserver/utils/tests/test_utils.py (+15/-0) |
||||
To merge this branch: | bzr merge lp:~rvb/maas/bug-1070765-hostname | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jeroen T. Vermeulen (community) | Approve | ||
Review via email: mp+131539@code.launchpad.net |
Commit message
Change the Node creation form to ignore the provided hostname if it looks like an ip-based hostname.
Description of the change
Change the Node creation form to ignore the provided hostname if it looks like an ip-based hostname.
I know that IP_BASED_
Drive-by fix: move strip_domain in the utils package.
To post a comment you must log in.
Typo in forms.py: “hode.” Also, same line (line 58 of the diff):
+ # Generate a hostname for this hode if provided the hostname is
I think right after “hode” it should say “if the provided hostname,” not “if provided the hostname.”