MAAS

Merge lp:~mpontillo/maas/fix-iprange-migration-message--bug-1585666 into lp:~maas-committers/maas/trunk

  1. fix-iprange-migration-message--bug-1585666
  2. Merge into trunk
Proposed by Mike Pontillo
Status: Merged
Approved by: Mike Pontillo
Approved revision: no longer in the source branch.
Merged at revision: 5172
Proposed branch: lp:~mpontillo/maas/fix-iprange-migration-message--bug-1585666
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 14 lines (+1/-3)
1 file modified
src/maasserver/migrations/builtin/maasserver/0021_nodegroupinterface_to_iprange.py (+1/-3)
To merge this branch: bzr merge lp:~mpontillo/maas/fix-iprange-migration-message--bug-1585666
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+299772@code.launchpad.net

Commit message

Update NodeGroupInterface -> IPRange migration message to reflect UX/design decisions for MAAS 2.x.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/migrations/builtin/maasserver/0021_nodegroupinterface_to_iprange.py'
2--- src/maasserver/migrations/builtin/maasserver/0021_nodegroupinterface_to_iprange.py 2016-05-11 19:01:48 +0000
3+++ src/maasserver/migrations/builtin/maasserver/0021_nodegroupinterface_to_iprange.py 2016-07-12 06:17:32 +0000
4@@ -51,9 +51,7 @@
5 find_best_subnet_for_ip_query, [low, high])
6 for subnet in subnets:
7 # There will only ever be one or zero due to the LIMIT 1.
8- comment = "Migrated from %s on %s" % (
9- ngi.interface, ngi.nodegroup.cluster_name)
10- comment = comment[255:]
11+ comment = "Migrated from MAAS 1.x"
12 iprange, created = IPRange.objects.get_or_create(
13 start_ip=low, end_ip=high, defaults={
14 'comment': comment,